Merge pull request #11890 from abarnas/stable-1.9

Fix powershell splatting leaving 'ExecutionPolicy Unrestricted' intact'
This commit is contained in:
Brian Coca 2015-08-07 10:41:56 -04:00
commit 5d9b0f16a6

4
lib/ansible/runner/shell_plugins/powershell.py Normal file → Executable file
View file

@ -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):