diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2013-06-29 16:30:29 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2013-06-29 16:30:29 +0200 |
| commit | 801c929b0dbe2b2569fc5d28c3c7c3dfbceae2b6 (patch) | |
| tree | 616e5a5f0f268c82773231f4b32c75a6f19b436f | |
| parent | 47b11e813fd33f50304e7013d3baf105bdfdde92 (diff) | |
| parent | 3346f2ea0f00e62a30ca38d680abdb47f8440259 (diff) | |
| download | bcfg2-801c929b0dbe2b2569fc5d28c3c7c3dfbceae2b6.tar.gz bcfg2-801c929b0dbe2b2569fc5d28c3c7c3dfbceae2b6.tar.bz2 bcfg2-801c929b0dbe2b2569fc5d28c3c7c3dfbceae2b6.zip | |
Merge remote branch 'github/action-shell' into splinev1.3.1-spline2
* github/action-shell:
Executor: do not split the command line if shell is true
| -rw-r--r-- | src/lib/Bcfg2/Utils.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Utils.py b/src/lib/Bcfg2/Utils.py index 9f46582c4..4293f3f69 100644 --- a/src/lib/Bcfg2/Utils.py +++ b/src/lib/Bcfg2/Utils.py @@ -216,7 +216,9 @@ class Executor(object): """ if isinstance(command, str): cmdstr = command - command = shlex.split(cmdstr) + + if not shell: + command = shlex.split(cmdstr) else: cmdstr = " ".join(command) self.logger.debug("Running: %s" % cmdstr) |