Merge pull request #6506 from terminalmage/issue6502

Fix traceback in salt-call --local
saltstack · Aug 2, 2013 · 1ab8c82 · 1ab8c82
2 parents 7670b18 + ab203f3
commit 1ab8c82
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/salt/cli/caller.py b/salt/cli/caller.py
@@ -52,7 +52,10 @@ def call(self):
         ret = {}
         fun = self.opts['fun']
         ret['jid'] = '{0:%Y%m%d%H%M%S%f}'.format(datetime.datetime.now())
-        proc_fn = os.path.join(self.opts['cachedir'], 'proc', ret['jid'])
+        proc_fn = os.path.join(
+            salt.minion.get_proc_dir(self.opts['cachedir']),
+            ret['jid']
+        )
         if fun not in self.minion.functions:
             sys.stderr.write('Function {0} is not available\n'.format(fun))
             sys.exit(-1)

diff --git a/salt/minion.py b/salt/minion.py
@@ -109,10 +109,6 @@ def get_proc_dir(cachedir):
     if not os.path.isdir(fn_):
         # proc_dir is not present, create it
         os.makedirs(fn_)
-    else:
-        # proc_dir is present, clean out old proc files
-        for proc_fn in os.listdir(fn_):
-            os.remove(os.path.join(fn_, proc_fn))
     return fn_