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 #54566 from garethgreenaway/2019_2_1_port_53080

Browse source 
[master] Porting #53080 to master
This commit is contained in:
Daniel Wozniak 2019-12-16 17:36:49 -07:00 • committed by GitHub
commit 6d837047f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/modules/win_pkg.py
View file

@ -1455,8 +1455,8 @@ def install(name=None, refresh=False, pkgs=None, **kwargs):
elif len(pkg_params) == 1:
# A dict of packages was passed, but it contains only 1 key, so we need
# to add the 'extra_install_flags'
for pkg in pkg_params:
pkg_params[pkg]['extra_install_flags'] = kwargs.get('extra_install_flags')
pkg = next(iter(pkg_params))
pkg_params[pkg]['extra_install_flags'] = kwargs.get('extra_install_flags')
# Get a list of currently installed software for comparison at the end
old = list_pkgs(saltenv=saltenv, refresh=refresh, versions_as_list=True)