From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Mon, 1 Jun 2015 12:32:16 +0000 (+0200)
Subject: bugfix - sequels of moving to format() from old-style %-formatting
X-Git-Tag: nepi-3.2.2-pypi~4
X-Git-Url: http://git.onelab.eu/?p=nepi.git;a=commitdiff_plain;h=1ee08b426b22d9e15616fa71f6eee4fa46c6a94f

bugfix - sequels of moving to format() from old-style %-formatting
there were 2 occurrences of an invocation of find that had a {} in them
---

diff --git a/src/nepi/resources/linux/node.py b/src/nepi/resources/linux/node.py
index 1bfbf6f4..4cd08163 100644
--- a/src/nepi/resources/linux/node.py
+++ b/src/nepi/resources/linux/node.py
@@ -468,8 +468,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 +480,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)