valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add multiple version support to apt

Browse Source
This commit is contained in:
Erik Johnson 2012-12-09 20:53:05 -06:00
parent bf778b9bee
commit 0645921f34
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/modules/apt.py
View File

@ -336,11 +336,13 @@ def list_pkgs(regex_string=''):
out = __salt__['cmd.run_stdout'](cmd) out = __salt__['cmd.run_stdout'](cmd)
# Typical line of output:
# install ok installed zsh 4.3.17-1ubuntu1
for line in out.splitlines(): for line in out.splitlines():
cols = line.split() cols = line.split()
if len(cols) and ('install' in cols[0] or 'hold' in cols[0]) and \ if len(cols) and ('install' in cols[0] or 'hold' in cols[0]) and \
'installed' in cols[2]: 'installed' in cols[2]:
ret[cols[3]] = cols[4] __salt__['pkg_resource.add_pkg'](ret, cols[3], cols[4])
# If ret is empty at this point, check to see if the package is virtual. # If ret is empty at this point, check to see if the package is virtual.
# We also need aptitude past this point. # We also need aptitude past this point.
@ -357,6 +359,7 @@ def list_pkgs(regex_string=''):
ret[regex_string] = '1' # Setting all 'installed' virtual package ret[regex_string] = '1' # Setting all 'installed' virtual package
# versions to '1' # versions to '1'
__salt__['pkg_resource.sort_pkglist'](ret)
return ret return ret