saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #43534 from twangboy/win_fix_pkg.install_2016.11

Browse source 
Fixes removal of double-quotes by shlex_split in winrepo for 2016.11
This commit is contained in:
Nicole Thomas 2017-09-21 10:39:41 -04:00 • committed by GitHub
commit be38239e5d
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/modules/win_pkg.py
View file

@ -1206,10 +1206,10 @@ def install(name=None, refresh=False, pkgs=None, **kwargs):
arguments = ['/i', cached_pkg]
if pkginfo[version_num].get('allusers', True):
arguments.append('ALLUSERS="1"')
arguments.extend(salt.utils.shlex_split(install_flags))
arguments.extend(salt.utils.shlex_split(install_flags, posix=False))
else:
cmd = cached_pkg
arguments = salt.utils.shlex_split(install_flags)
arguments = salt.utils.shlex_split(install_flags, posix=False)
# Install the software
# Check Use Scheduler Option
@ -1513,10 +1513,10 @@ def remove(name=None, pkgs=None, version=None, **kwargs):
if use_msiexec:
cmd = msiexec
arguments = ['/x']
arguments.extend(salt.utils.shlex_split(uninstall_flags))
arguments.extend(salt.utils.shlex_split(uninstall_flags, posix=False))
else:
cmd = expanded_cached_pkg
arguments = salt.utils.shlex_split(uninstall_flags)
arguments = salt.utils.shlex_split(uninstall_flags, posix=False)
# Create Scheduled Task
__salt__['task.create_task'](name='update-salt-software',
@ -1543,7 +1543,7 @@ def remove(name=None, pkgs=None, version=None, **kwargs):
cmd.extend([msiexec, '/x', expanded_cached_pkg])
else:
cmd.append(expanded_cached_pkg)
cmd.extend(salt.utils.shlex_split(uninstall_flags))
cmd.extend(salt.utils.shlex_split(uninstall_flags, posix=False))
# Launch the command
result = __salt__['cmd.run_all'](cmd,
output_loglevel='trace',