cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

powershell - remove env var (#72010) (#72012)

Browse source 
(cherry picked from commit 3c33618cf6)
This commit is contained in:
Jordan Borean 2020-10-22 06:27:57 +10:00 committed by GitHub
parent e6a4585807
commit cd89aadec1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/powershell-version-env.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- powershell - remove getting the PowerShell version from the env var ``POWERSHELL_VERSION``. This feature never worked properly and can cause conflicts with other libraries that use this var

6
lib/ansible/plugins/shell/powershell.py
View file

@ -30,12 +30,6 @@ from ansible.plugins.shell import ShellBase
_common_args = ['PowerShell', '-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Unrestricted']
# Primarily for testing, allow explicitly specifying PowerShell version via
# an environment variable.
_powershell_version = os.environ.get('POWERSHELL_VERSION', None)
if _powershell_version:
_common_args = ['PowerShell', '-Version', _powershell_version] + _common_args[1:]
def _parse_clixml(data, stream="Error"):
"""