romain-dartigues/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'steven/master'

Browse source
This commit is contained in:
Nico Schottelius 2011-10-14 23:55:46 +02:00
commit 46fde0e9fe
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/cdist/exec/local.py
View file

@ -123,7 +123,7 @@ class Local(object):
else: else:
subprocess.check_call(command, env=env) subprocess.check_call(command, env=env)
except subprocess.CalledProcessError as error: except subprocess.CalledProcessError as error:
script_content = self.run(["cat", script]) script_content = self.run(["cat", script], return_output=True)
self.log.error("Code that raised the error:\n%s", script_content) self.log.error("Code that raised the error:\n%s", script_content)
raise LocalScriptError(script, command, script_content) raise LocalScriptError(script, command, script_content)
except EnvironmentError as error: except EnvironmentError as error:

2
lib/cdist/exec/remote.py
View file

@ -148,7 +148,7 @@ class Remote(object):
else: else:
subprocess.check_call(command) subprocess.check_call(command)
except subprocess.CalledProcessError as error: except subprocess.CalledProcessError as error:
script_content = self.run(["cat", script]) script_content = self.run(["cat", script], return_output=True)
self.log.error("Code that raised the error:\n%s", script_content) self.log.error("Code that raised the error:\n%s", script_content)
raise RemoteScriptError(script, command, script_content) raise RemoteScriptError(script, command, script_content)
except EnvironmentError as error: except EnvironmentError as error: