From 83c2e615254fac6fc83b7468bc62e109e984bb8d Mon Sep 17 00:00:00 2001 From: Intchanter Date: Thu, 1 Aug 2013 04:07:46 +0000 Subject: [PATCH] Used a safer method to get proc_fn Previously, this called get_proc_dir(), which clears the contents of the specified directory, resulting in issue #6238. --- salt/cli/caller.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/salt/cli/caller.py b/salt/cli/caller.py index 9ef659bfb8..6cce9cfd2e 100644 --- a/salt/cli/caller.py +++ b/salt/cli/caller.py @@ -52,9 +52,7 @@ class Caller(object): ret = {} fun = self.opts['fun'] ret['jid'] = '{0:%Y%m%d%H%M%S%f}'.format(datetime.datetime.now()) - proc_fn = os.path.join( - salt.minion.get_proc_dir(self.opts['cachedir']), - ret['jid']) + proc_fn = os.path.join(self.opts['cachedir'], 'proc', ret['jid']) if fun not in self.minion.functions: sys.stderr.write('Function {0} is not available\n'.format(fun)) sys.exit(-1)