cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Cleanup the old apt compatibility changes

Browse source
This commit is contained in:
Toshio Kuratomi 2014-12-25 00:25:02 -08:00
parent 8ce5720bb0
commit 170457413d
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
packaging/os/apt.py
View file

@ -174,19 +174,14 @@ def package_split(pkgspec):
return parts[0], None return parts[0], None
def package_versions(pkgname, pkg, pkg_cache): def package_versions(pkgname, pkg, pkg_cache):
versions = {}
try: try:
for p in pkg.versions: versions = set(p.version for p in pkg.versions)
versions[p.version] = p.version
except AttributeError: except AttributeError:
# assume older version of python-apt is installed # assume older version of python-apt is installed
# apt.package.Package#versions require python-apt >= 0.7.9. # apt.package.Package#versions require python-apt >= 0.7.9.
pkg_cache_list = filter(lambda p: p.Name == pkgname, pkg_cache.Packages) pkg_cache_list = (p for p in pkg_cache.Packages if p.Name == pkgname)
pkg_versions = (p.VersionList for p in pkg_cache_list)
for pkg_cache in pkg_cache_list: versions = set(p.VerStr for p in pkg_versions)
for p in pkg_cache.VersionList:
versions[p.VerStr] = p.VerStr
return versions return versions
@ -244,7 +239,7 @@ def package_status(m, pkgname, version, cache, state):
# Only claim the package is upgradable if a candidate matches the version # Only claim the package is upgradable if a candidate matches the version
package_is_upgradable = False package_is_upgradable = False
for candidate in avail_upgrades: for candidate in avail_upgrades:
if package_version_compare(versions[candidate], installed_version) > 0: if package_version_compare(candidate, installed_version) > 0:
package_is_upgradable = True package_is_upgradable = True
break break
else: else: