Merge pull request #469 from nafeger/devel

Add support for older version of python-apt
reviewable/pr18780/r1
Michael DeHaan 13 years ago
commit 9ec000c8c0

12
apt

@ -74,9 +74,17 @@ def package_status(pkgname, version, cache):
except KeyError: except KeyError:
fail_json(msg="No package matching '%s' is available" % pkgname) fail_json(msg="No package matching '%s' is available" % pkgname)
if version: if version:
return pkg.is_installed and pkg.installed.version == version, False try :
return pkg.is_installed and pkg.installed.version == version, False
except AttributeError:
#assume older version of python-apt is installed
return pkg.isInstalled and pkg.installedVersion == version, False
else: else:
return pkg.is_installed, pkg.is_upgradable try :
return pkg.is_installed, pkg.is_upgradable
except AttributeError:
#assume older version of python-apt is installed
return pkg.isInstalled, pkg.isUpgradable
def install(pkgspec, cache, upgrade=False, default_release=None): def install(pkgspec, cache, upgrade=False, default_release=None):
name, version = package_split(pkgspec) name, version = package_split(pkgspec)

Loading…
Cancel
Save