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

Merge pull request #6119 from terminalmage/quickfix

Browse Source 
Change behavior of apt._clean_pkglist
This commit is contained in:
Joseph Hall 2013-07-11 20:37:11 -07:00
commit 1bf40a8f74
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
salt/modules/apt.py
View File

@ -463,16 +463,17 @@ def upgrade(refresh=True, **kwargs):
def _clean_pkglist(pkgs):
'''
Go through package list and, if any packages have a mix of actual versions
and virtual package markers, remove the virtual package markers.
Go through package list and, if any packages have more than one virtual
package marker and no actual package versions, remove all virtual package
markers. If there is a mix of actual package versions and virtual package
markers, remove the virtual package markers.
'''
for key in pkgs.keys():
if '1' in pkgs[key] and len(pkgs[key]) > 1:
while True:
try:
pkgs[key].remove('1')
except ValueError:
break
for name, versions in pkgs.iteritems():
stripped = filter(lambda x: x != '1', versions)
if not stripped:
pkgs[name] = ['1']
elif versions != stripped:
pkgs[name] = stripped
def list_pkgs(versions_as_list=False, removed=False):