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

Match unversioned packages to winrepo

Browse source
This commit is contained in:
twangboy 2016-02-22 15:25:34 -07:00
parent ac6af79abc
commit 85d8b938ad
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
salt/modules/win_pkg.py
View file

@ -236,9 +236,19 @@ def list_pkgs(versions_as_list=False, **kwargs):
ret = {}
name_map = _get_name_map()
for key, val in six.iteritems(_get_reg_software()):
if key in name_map:
key = name_map[key]
for pkg_name, val in six.iteritems(_get_reg_software()):
if pkg_name in name_map:
key = name_map[pkg_name]
if not val:
# Look up version from winrepo
pkg_info = _get_package_info(key)
if not pkg_info:
continue
for pkg_ver in pkg_info.keys():
if pkg_info[pkg_ver]['full_name'] == pkg_name:
val = pkg_ver
else:
key = pkg_name
__salt__['pkg_resource.add_pkg'](ret, key, val)
__salt__['pkg_resource.sort_pkglist'](ret)