diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2014-11-16 16:41:53 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2014-11-16 17:37:52 +0100 |
| commit | 41d66f5eba22ba37bcb798cd5f110be868de0e10 (patch) | |
| tree | 5e8b5e1feb35b9780f6133b46750fd98d76be881 | |
| parent | 5e58894c77a8560894b9c2091330c3a056746a08 (diff) | |
| download | bcfg2-41d66f5eba22ba37bcb798cd5f110be868de0e10.tar.gz bcfg2-41d66f5eba22ba37bcb798cd5f110be868de0e10.tar.bz2 bcfg2-41d66f5eba22ba37bcb798cd5f110be868de0e10.zip | |
Client/Tools/APT: use "pkg in cache" everywhere
The "in syntax" is supported instead of the cache.has_key(pkg) syntax
at least since python-apt-0.7.91.
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/APT.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/APT.py b/src/lib/Bcfg2/Client/Tools/APT.py index 19e506105..bafe4e528 100644 --- a/src/lib/Bcfg2/Client/Tools/APT.py +++ b/src/lib/Bcfg2/Client/Tools/APT.py @@ -159,9 +159,9 @@ class APT(Bcfg2.Client.Tools.Tool): (entry.attrib['name'])) return False pkgname = entry.get('name') - if self.pkg_cache.has_key(pkgname): # noqa + if pkgname in self.pkg_cache: is_installed = self.pkg_cache[pkgname].is_installed - if not self.pkg_cache.has_key(pkgname) or not is_installed: # noqa + if pkgname not in self.pkg_cache or not is_installed: self.logger.info("Package %s not installed" % (entry.get('name'))) entry.set('current_exists', 'false') return False @@ -216,7 +216,7 @@ class APT(Bcfg2.Client.Tools.Tool): ipkgs = [] bad_pkgs = [] for pkg in packages: - if not self.pkg_cache.has_key(pkg.get('name')): # noqa + if pkg.get('name') not in self.pkg_cache: self.logger.error("APT has no information about package %s" % (pkg.get('name'))) continue |