From: smbaker <smbaker@fc8clean.lan>
Date: Tue, 4 Oct 2011 02:19:48 +0000 (-0700)
Subject: fix wrong slice renewed when doing batch renew
X-Git-Tag: sface-0.1-20~22
X-Git-Url: http://git.onelab.eu/?p=sface.git;a=commitdiff_plain;h=7bc9576fe11f712b7ff8b5565bf5ad8d59ff06ab

fix wrong slice renewed when doing batch renew
---

diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py
index c5a056b..cfa1109 100644
--- a/sface/sfiprocess.py
+++ b/sface/sfiprocess.py
@@ -200,10 +200,13 @@ class SfiProcess(QObject):
         self.__init_command(args)
         self.start()
 
-    def renewSlivers(self, expiration):
+    def renewSlivers(self, expiration, slice=None):
+        if not slice:
+            slice = config.getSlice()
+
         args = ["-u", config.getUser(), "-a", config.getAuthority(),
                 "-r", config.getRegistry(), "-s", config.getSlicemgr(), "renew",
-                config.getSlice(), expiration]
+                slice, expiration]
         self.__init_command(args)
         self.start()
 
diff --git a/sface/sfirenew.py b/sface/sfirenew.py
index dda2652..abbeb57 100644
--- a/sface/sfirenew.py
+++ b/sface/sfirenew.py
@@ -68,7 +68,7 @@ class SfiRenewer(QObject):
         # call renewSlivers on the aggregate
         self.disconnect(self.renewProcess, SIGNAL('finished()'), self.finishedUpdateRecord)
         self.connect(self.renewProcess, SIGNAL('finished()'), self.finishedRenewSlivers)
-        self.renewProcess.renewSlivers(self.newExpiration.strftime("%Y-%m-%dT%H:%M:%SZ"))
+        self.renewProcess.renewSlivers(self.newExpiration.strftime("%Y-%m-%dT%H:%M:%SZ"), slice = self.hrn)
 
     def finishedRenewSlivers(self):
         self.faultString = self.renewProcess.getFaultString()