diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2014-11-16 17:12:10 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2014-11-16 17:37:58 +0100 |
| commit | 21d7a3e4e680f925eb65f7e29ecc2365d4295e69 (patch) | |
| tree | d0b96ea3f40b721fac9312b509c31f08ab3af5bf | |
| parent | 41d66f5eba22ba37bcb798cd5f110be868de0e10 (diff) | |
| download | bcfg2-21d7a3e4e680f925eb65f7e29ecc2365d4295e69.tar.gz bcfg2-21d7a3e4e680f925eb65f7e29ecc2365d4295e69.tar.bz2 bcfg2-21d7a3e4e680f925eb65f7e29ecc2365d4295e69.zip | |
Client/Tools/APT: use more modern python-apt API
python-apt provides a public API for all required steps.
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/APT.py | 11 |
1 files changed, 2 insertions, 9 deletions
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 |