From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Sat, 1 Oct 2011 08:51:13 +0000 (+0200)
Subject: Do not re-install keys on retrials (they're no longer available)
X-Git-Tag: nepi-3.0.0~194
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a4c59ba6c8179cd1ecabc296f2de352de2ec9e0a;p=nepi.git

Do not re-install keys on retrials (they're no longer available)
---

diff --git a/src/nepi/testbeds/planetlab/application.py b/src/nepi/testbeds/planetlab/application.py
index d2f0351a..9ca828c9 100644
--- a/src/nepi/testbeds/planetlab/application.py
+++ b/src/nepi/testbeds/planetlab/application.py
@@ -228,9 +228,10 @@ class Dependency(object):
             .replace("${SOURCES}", root+server.shell_escape(self.home_path))
             .replace("${BUILD}", root+server.shell_escape(os.path.join(self.home_path,'build'))) )
 
-    def _launch_build(self):
+    def _launch_build(self, trial=0):
         if self._master is not None:
-            self._do_install_keys()
+            if not trial:
+                self._do_install_keys()
             buildscript = self._do_build_slave()
         else:
             buildscript = self._do_build_master()
@@ -467,7 +468,7 @@ class Dependency(object):
                     # bad sync with master, may try again
                     # but first wait for master
                     self._master.async_setup_wait()
-                    self._launch_build()
+                    self._launch_build(trial+1)
                     self._do_wait_build(trial+1)
                 else:
                     raise RuntimeError, "Failed to set up application %s: "\