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

raise cdist errors

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-09-26 15:42:39 +02:00
parent ef197eebe3
commit 4906f604f0
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/cdist/exec.py
View file

@ -24,6 +24,8 @@ import subprocess
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
import cdist
def shell_run_or_debug_fail(script, *args, **kargs): def shell_run_or_debug_fail(script, *args, **kargs):
# Manually execute /bin/sh, because sh -e does what we want # Manually execute /bin/sh, because sh -e does what we want
# and sh -c -e does not exit if /bin/false called # and sh -c -e does not exit if /bin/false called
@ -50,11 +52,11 @@ def shell_run_or_debug_fail(script, *args, **kargs):
print(script_fd.read()) print(script_fd.read())
script_fd.close() script_fd.close()
except IOError as error: except IOError as error:
raise CdistError(str(error)) raise cdist.Error(str(error))
raise CdistError("Command failed (shell): " + " ".join(*args)) raise cdist.Error("Command failed (shell): " + " ".join(*args))
except OSError as error: except OSError as error:
raise CdistError(" ".join(*args) + ": " + error.args[1]) raise cdist.Error(" ".join(*args) + ": " + error.args[1])
def run_or_fail(*args, **kargs): def run_or_fail(*args, **kargs):
@ -66,6 +68,6 @@ def run_or_fail(*args, **kargs):
try: try:
subprocess.check_call(*args, **kargs) subprocess.check_call(*args, **kargs)
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
raise CdistError("Command failed: " + " ".join(*args)) raise cdist.Error("Command failed: " + " ".join(*args))
except OSError as error: except OSError as error:
raise CdistError(" ".join(*args) + ": " + error.args[1]) raise cdist.Error(" ".join(*args) + ": " + error.args[1])