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

fix not so obvious tuple/str error (trailing comma from c&p)

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-09-11 14:11:54 +02:00
parent c9c808a732
commit 5702706adf
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bin/cdist
View file

@ -152,7 +152,6 @@ class Cdist:
def shell_run_or_debug_fail(self, script, *args, **kargs): def shell_run_or_debug_fail(self, 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
print(args)
args[0][:0] = [ "/bin/sh", "-e" ] args[0][:0] = [ "/bin/sh", "-e" ]
if "remote" in kargs: if "remote" in kargs:
@ -162,9 +161,8 @@ class Cdist:
del kargs["remote"] del kargs["remote"]
print(args) log.debug("Shell exec cmd: %s", args)
print(*args) log.debug("Shell exec env: %s", kargs['env'])
log.debug("Shell exec: " + " ".join(*args))
try: try:
subprocess.check_call(*args, **kargs) subprocess.check_call(*args, **kargs)
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
@ -496,8 +494,8 @@ class Cdist:
env = os.environ.copy() env = os.environ.copy()
env['__target_host'] = self.target_host env['__target_host'] = self.target_host
env['__global'] = self.out_dir env['__global'] = self.out_dir
env["__object"] = self.object_dir(cdist_object), env["__object"] = self.object_dir(cdist_object)
env["__object_id"] = self.get_object_id_from_object(cdist_object), env["__object_id"] = self.get_object_id_from_object(cdist_object)
env["__object_fq"] = cdist_object env["__object_fq"] = cdist_object
if mode == "gencode": if mode == "gencode":