From 21d7a3e4e680f925eb65f7e29ecc2365d4295e69 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Sun, 16 Nov 2014 17:12:10 +0100 Subject: Client/Tools/APT: use more modern python-apt API python-apt provides a public API for all required steps. --- src/lib/Bcfg2/Client/Tools/APT.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/lib/Bcfg2/Client/Tools/APT.py b/src/lib/Bcfg2/Client/Tools/APT.py index bafe4e528..46684d30d 100644 --- a/src/lib/Bcfg2/Client/Tools/APT.py +++ b/src/lib/Bcfg2/Client/Tools/APT.py @@ -170,10 +170,7 @@ class APT(Bcfg2.Client.Tools.Tool): installed_version = pkg.installed.version candidate_version = pkg.candidate.version if entry.get('version') == 'auto': - # pylint: disable=W0212 - is_upgradable = self.pkg_cache._depcache.is_upgradable(pkg._pkg) - # pylint: enable=W0212 - if is_upgradable: + if pkg.is_upgradable: desired_version = candidate_version else: desired_version = installed_version @@ -229,11 +226,7 @@ class APT(Bcfg2.Client.Tools.Tool): self.logger.error("Failed to find %s in apt package " "cache" % pkg.get('name')) continue - # pylint: disable=W0212 - avail_vers = [ - x.ver_str for x in - self.pkg_cache[pkg.get('name')]._pkg.version_list] - # pylint: enable=W0212 + avail_vers = self.pkg_cache[pkg.get('name')].versions.keys() if pkg.get('version') in avail_vers: ipkgs.append("%s=%s" % (pkg.get('name'), pkg.get('version'))) continue -- cgit v1.2.3-1-g7c22