From 8b561fd63ca886d20644d1e8f977258c9074947c Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 6 Oct 2011 16:30:06 +0200 Subject: [PATCH] fixup correct split/insert of os.environ() for target_host and args Signed-off-by: Nico Schottelius --- lib/cdist/exec.py | 8 ++++++-- lib/cdist/path.py | 8 ++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/cdist/exec.py b/lib/cdist/exec.py index bb375404..a9b8d147 100644 --- a/lib/cdist/exec.py +++ b/lib/cdist/exec.py @@ -33,7 +33,9 @@ def shell_run_or_debug_fail(script, *args, remote_prefix=False, **kargs): args[0][:0] = [ "/bin/sh", "-e" ] if remote_prefix: - args[0][:0] = os.environ['__remote_exec'] + remote_prefix = os.environ['__remote_exec'].split() + remote_prefix.append(os.environ['target_host']) + args[0][:0] = remote_prefix log.debug("Shell exec cmd: %s", args) @@ -62,7 +64,9 @@ def shell_run_or_debug_fail(script, *args, remote_prefix=False, **kargs): def run_or_fail(*args, remote_prefix=False, **kargs): if remote_prefix: - args[0][:0] = os.environ['__remote_exec'] + remote_prefix = os.environ['__remote_exec'].split() + remote_prefix.append(os.environ['target_host']) + args[0][:0] = remote_prefix log.debug("Exec: " + " ".join(*args)) try: diff --git a/lib/cdist/path.py b/lib/cdist/path.py index a2b47610..85d1a87f 100644 --- a/lib/cdist/path.py +++ b/lib/cdist/path.py @@ -125,13 +125,13 @@ class Path: def transfer_dir(self, source, destination): """Transfer directory and previously delete the remote destination""" self.remove_remote_dir(destination) - cdist.exec.run_or_fail([os.environ['__remote_copy'], "-r", source, - self.target_host + ":" + destination]) + cdist.exec.run_or_fail(os.environ['__remote_copy'].split() + + ["-r", source, self.target_host + ":" + destination]) def transfer_file(self, source, destination): """Transfer file""" - cdist.exec.run_or_fail([os.environ['__remote_copy'], source, - self.target_host + ":" + destination]) + cdist.exec.run_or_fail(os.environ['__remote_copy'].split() + + [source, self.target_host + ":" + destination]) def global_explorer_output_path(self, explorer): """Returns path of the output for a global explorer"""