X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fsfirenew.py;h=47ddf2a7160c2e40f06b49bbc27f89a64015468d;hp=ca803869d1f535a45b30d41087cadc718f9f6c42;hb=bb62e92aac67d6a2a3e057e62a52490d0da40ae8;hpb=b338d4f78bd5df13617d08717b59bd8042a7465d

diff --git a/sface/sfirenew.py b/sface/sfirenew.py
index ca80386..47ddf2a 100644
--- a/sface/sfirenew.py
+++ b/sface/sfirenew.py
@@ -16,12 +16,18 @@ class SfiRenewer(QObject):
         QObject.__init__(self, parent)
         self.hrn = hrn
         self.newExpiration = newExpiration
+        self.faultString = None
 
         self.renewProcess = SfiProcess(self)
         self.connect(self.renewProcess, SIGNAL('finished()'), self.finishedGetRecord)
         self.renewProcess.getRecord(hrn=config.getSlice(), filename="/tmp/slicerecord")
 
     def finishedGetRecord(self):
+        faultString = self.renewProcess.getFaultString()
+        if faultString:
+            self.emitFinished("fault", faultString)
+            return
+
         f = open("/tmp/slicerecord", "r")
         data = f.read()
         f.close()
@@ -45,8 +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)
 
@@ -58,6 +69,11 @@ class SfiRenewer(QObject):
         self.renewProcess.renewSlivers(self.newExpiration.strftime("%Y-%m-%dT%H:%M:%SZ"))
 
     def finishedRenewSlivers(self):
+        faultString = self.renewProcess.getFaultString()
+        if faultString:
+            self.emitFinished("fault", faultString)
+            return
+
         self.emitFinished("success")
 
     def emitFinished(self, status, statusMsg=None):
@@ -88,6 +104,7 @@ class RenewWindow(QDialog):
         self.duration.setCurrentIndex(0)
 
         self.status = QLabel("")
+        self.status.setMaximumWidth(640)
 
         self.buttonBox = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
         self.buttonBox.button(QDialogButtonBox.Ok).setDefault(True)
@@ -116,16 +133,23 @@ class RenewWindow(QDialog):
         self.status.setText(x)
 
     def renewFinished(self):
+        if self.renewProcess.status == "success":
+            color = "green"
+            # give the user the <close> button
+            self.buttonBox.clear()
+            self.buttonBox.addButton(QDialogButtonBox.Close)
+        else:
+            color = "red"
+
         if self.renewProcess.statusMsg:
-            self.setStatus("Renew " + self.renewProcess.status + ": " + self.renewProcess.statusMsg)
+            self.setStatus("<font color='%s'>Renew %s: %s</font>" % (color, self.renewProcess.status, self.renewProcess.statusMsg))
         else:
-            self.setStatus("Renew " + self.renewProcess.status)
-        self.disconnect(self.renewProcess, SIGNAL('finished()'), self.renewFinished)
-        self.renewProcess = None
+            self.setStatus("<font color='%s'>Renew %s</font>" % (color, self.renewProcess.status))
 
         self.buttonBox.setEnabled(True)
-        self.buttonBox.clear()
-        self.buttonBox.addButton(QDialogButtonBox.Close)
+
+        self.disconnect(self.renewProcess, SIGNAL('finished()'), self.renewFinished)
+        self.renewProcess = None
 
     def get_new_expiration(self):
         index = self.duration.currentIndex()