tom/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

--copy paste error

Browse source 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
Steven Armstrong 2011-10-14 16:04:55 +02:00
parent c9bb105518
commit bbef928a6d
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -114,9 +114,9 @@ class Remote(object):
self.log.debug("Remote run: %s", command) self.log.debug("Remote run: %s", command)
try: try:
if return_output: if return_output:
return subprocess.check_output(command, env=env).decode() return subprocess.check_output(command).decode()
else: else:
subprocess.check_call(command, env=env) subprocess.check_call(command)
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
raise cdist.Error("Command failed: " + " ".join(command)) raise cdist.Error("Command failed: " + " ".join(command))
except OSError as error: except OSError as error:
@ -144,9 +144,9 @@ class Remote(object):
try: try:
if return_output: if return_output:
return subprocess.check_output(command, env=env).decode() return subprocess.check_output(command).decode()
else: else:
subprocess.check_call(command, env=env) 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])
self.log.error("Code that raised the error:\n%s", script_content) self.log.error("Code that raised the error:\n%s", script_content)