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

Fix virtual package detection

Browse source 
Virtual package detection was broken in #44455. This restores it for the
remainder of the 2018.3 release cycle, at which time it will be removed
altogether.
This commit is contained in:
Erik Johnson 2018-04-23 14:31:21 -05:00
parent bf3a67d11b
commit b8630a70be
No known key found for this signature in database
GPG key ID: 5E5583C437808F3F
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/modules/aptpkg.py
View file

@ -197,7 +197,7 @@ def _get_virtual():
__context__['pkg._get_virtual'][realpkg] = []
__context__['pkg._get_virtual'][realpkg].append(pkg.name)
elif _has_dctrl_tools():
cmd = ['grep-available', '-F', 'Provides', '-s',
cmd = ['grep-status', '-F', 'Provides', '-s',
'Package,Provides', '-e', '^.+$']
out = __salt__['cmd.run_stdout'](cmd,
output_loglevel='trace',
@ -1393,8 +1393,8 @@ def list_pkgs(versions_as_list=False,
name,
version_num)
# Check for virtual packages. We need dctrl-tools for this.
if not removed and not HAS_APT:
# Check for virtual packages
if not removed:
try:
virtpkgs_all = _get_virtual()
except CommandExecutionError as cee: