X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Flinux%2Fnode.py;h=ab10baee3bc6356f6c4ad8044a3ea83abff4dd32;hb=7137010b13dcede2f6efcff0be902e1676b40144;hp=1bfbf6f433b21e60e5bfd20944096ee41193098a;hpb=c4bc62be01922ad2c39c8326df9ed1619a12513c;p=nepi.git

diff --git a/src/nepi/resources/linux/node.py b/src/nepi/resources/linux/node.py
index 1bfbf6f4..ab10baee 100644
--- a/src/nepi/resources/linux/node.py
+++ b/src/nepi/resources/linux/node.py
@@ -352,7 +352,8 @@ class LinuxNode(ResourceManager):
     def do_provision(self):
         # check if host is alive
         if not self.is_alive():
-            msg = "Deploy failed. Unresponsive node {}".format(self.get("hostname"))
+            trace = traceback.format_exc()
+            msg = "Deploy failed. Unresponsive node {} -- traceback {}".format(self.get("hostname"), trace)
             self.error(msg)
             raise RuntimeError, msg
 
@@ -442,7 +443,7 @@ class LinuxNode(ResourceManager):
                 import pickle
                 pids = pickle.load(open("/tmp/save.proc", "rb"))
                 pids_temp = dict()
-                ps_aux = "ps aux |awk '{print $2,$11}'"
+                ps_aux = "ps aux | awk '{print $2,$11}'"
                 (out, err), proc = self.execute(ps_aux)
                 if len(out) != 0:
                     for line in out.strip().split("\n"):
@@ -468,8 +469,8 @@ class LinuxNode(ResourceManager):
         """
         self.info("Cleaning up home")
         
-        cmd = "cd {} ; find . -maxdepth 1 -name \.nepi -execdir rm -rf {} + "\
-              .format(self.home_dir, self.exp_dir)
+        cmd = "cd {} ; find . -maxdepth 1 -name \.nepi -execdir rm -rf {{}} + "\
+              .format(self.home_dir)
 
         return self.execute(cmd, with_lock = True)
 
@@ -480,8 +481,8 @@ class LinuxNode(ResourceManager):
         """
         self.info("Cleaning up experiment files")
         
-        cmd = "cd {} ; find . -maxdepth 1 -name '{}' -execdir rm -rf {} + "\
-              .format(self.exp_dir, self.ec.exp_id, self.exp_dir)
+        cmd = "cd {} ; find . -maxdepth 1 -name '{}' -execdir rm -rf {{}} + "\
+              .format(self.exp_dir, self.ec.exp_id)
         
         return self.execute(cmd, with_lock = True)