From 5702706adf5badf120fc60d742164034ce934a76 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Sun, 11 Sep 2011 14:11:54 +0200 Subject: [PATCH] fix not so obvious tuple/str error (trailing comma from c&p) Signed-off-by: Nico Schottelius --- bin/cdist | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/bin/cdist b/bin/cdist index 7c2de358..7e6f6ddf 100755 --- a/bin/cdist +++ b/bin/cdist @@ -152,7 +152,6 @@ class Cdist: def shell_run_or_debug_fail(self, script, *args, **kargs): # Manually execute /bin/sh, because sh -e does what we want # and sh -c -e does not exit if /bin/false called - print(args) args[0][:0] = [ "/bin/sh", "-e" ] if "remote" in kargs: @@ -162,9 +161,8 @@ class Cdist: del kargs["remote"] - print(args) - print(*args) - log.debug("Shell exec: " + " ".join(*args)) + log.debug("Shell exec cmd: %s", args) + log.debug("Shell exec env: %s", kargs['env']) try: subprocess.check_call(*args, **kargs) except subprocess.CalledProcessError: @@ -496,8 +494,8 @@ class Cdist: env = os.environ.copy() env['__target_host'] = self.target_host env['__global'] = self.out_dir - env["__object"] = self.object_dir(cdist_object), - env["__object_id"] = self.get_object_id_from_object(cdist_object), + env["__object"] = self.object_dir(cdist_object) + env["__object_id"] = self.get_object_id_from_object(cdist_object) env["__object_fq"] = cdist_object if mode == "gencode":