From: Mario Zancanaro <nano@creaator.com>
Date: Tue, 12 May 2015 13:31:42 +0000 (+0200)
Subject: Bug fixing in cleanExperiment and cleanHome for linux nodes. The last place-holder... 
X-Git-Tag: nepi-3.2.2-pypi~5
X-Git-Url: http://git.onelab.eu/?p=nepi.git;a=commitdiff_plain;h=c4bc62be01922ad2c39c8326df9ed1619a12513c

Bug fixing in cleanExperiment and cleanHome for linux nodes. The last place-holder had no variable.
---

diff --git a/src/nepi/resources/linux/node.py b/src/nepi/resources/linux/node.py
index 0abbf8fe..1bfbf6f4 100644
--- a/src/nepi/resources/linux/node.py
+++ b/src/nepi/resources/linux/node.py
@@ -469,7 +469,7 @@ class LinuxNode(ResourceManager):
         self.info("Cleaning up home")
         
         cmd = "cd {} ; find . -maxdepth 1 -name \.nepi -execdir rm -rf {} + "\
-              .format(self.home_dir)
+              .format(self.home_dir, self.exp_dir)
 
         return self.execute(cmd, with_lock = True)
 
@@ -481,7 +481,7 @@ 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)
+              .format(self.exp_dir, self.ec.exp_id, self.exp_dir)
         
         return self.execute(cmd, with_lock = True)