summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Coca <bcoca@ansible.com>2015-08-07 10:41:56 -0400
committerBrian Coca <bcoca@ansible.com>2015-08-07 10:41:56 -0400
commit5d9b0f16a6d8d79e1912c7ddb4f0694ed7e1d5c9 (patch)
treef1966633e8af303a55278add807634a7cd4b8fe1
parent2b909b4eb5930ff0b57a2a3f056a89ae863763ff (diff)
parent4f0adfb865402265e16b25ab13471c4c038b67bd (diff)
downloadansible-5d9b0f16a6d8d79e1912c7ddb4f0694ed7e1d5c9.tar.gz
Merge pull request #11890 from abarnas/stable-1.9
Fix powershell splatting leaving 'ExecutionPolicy Unrestricted' intact'
-rwxr-xr-x[-rw-r--r--]lib/ansible/runner/shell_plugins/powershell.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ansible/runner/shell_plugins/powershell.py b/lib/ansible/runner/shell_plugins/powershell.py
index 850b380edd..a5709a012c 100644..100755
--- a/lib/ansible/runner/shell_plugins/powershell.py
+++ b/lib/ansible/runner/shell_plugins/powershell.py
@@ -22,7 +22,7 @@ import random
import shlex
import time
-_common_args = ['PowerShell', '-NoProfile', '-NonInteractive']
+_common_args = ['PowerShell', '-NoProfile', '-NonInteractive','-ExecutionPolicy', 'Unrestricted']
# Primarily for testing, allow explicitly specifying PowerShell version via
# an environment variable.
@@ -57,7 +57,7 @@ def _build_file_cmd(cmd_parts, quote_args=True):
'''Build command line to run a file, given list of file name plus args.'''
if quote_args:
cmd_parts = ['"%s"' % x for x in cmd_parts]
- return ' '.join(_common_args + ['-ExecutionPolicy', 'Unrestricted', '-File'] + cmd_parts)
+ return ' '.join(['&'] + cmd_parts)
class ShellModule(object):