Merge branch 'master' of ssh://git.onelab.eu/git/sface
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 8 Sep 2011 12:25:19 +0000 (14:25 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 8 Sep 2011 12:25:19 +0000 (14:25 +0200)
1  2 
sface/sfiprocess.py
sface/sfirenew.py

Simple merge
@@@ -43,8 -51,13 +51,13 @@@ class SfiRenewer(QObject)
          self.renewProcess.updateRecord("/tmp/slicerecord")
  
      def finishedUpdateRecord(self):
+         faultString = self.renewProcess.getFaultString()
+         if faultString:
+             self.emitFinished("fault", faultString)
+             return
          # we have to force sfi.py to download an updated slice credential
 -        sliceCredName = os.path.expanduser("~/.sfi/slice_" + self.hrn.split(".")[-1] + ".cred")
 +        sliceCredName = config.fullpath("slice_" + self.hrn.split(".")[-1] + ".cred")
          if os.path.exists(sliceCredName):
              os.remove(sliceCredName)