diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2015-04-28 12:22:41 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2015-04-28 12:22:41 -0500 |
| commit | 7fe71f90b800fc2d8ce04253fa55ec913a1d0353 (patch) | |
| tree | 9307c1890a53aa82f919a129b65d5d9ccb023049 | |
| parent | 1c354873cb9adb954752bf6b7742e5ee8c1f4d69 (diff) | |
| parent | 45a63e8cf0bfc5de075ee68d54b492b30f59bc77 (diff) | |
| download | bcfg2-7fe71f90b800fc2d8ce04253fa55ec913a1d0353.tar.gz bcfg2-7fe71f90b800fc2d8ce04253fa55ec913a1d0353.tar.bz2 bcfg2-7fe71f90b800fc2d8ce04253fa55ec913a1d0353.zip | |
Merge branch 'fix-yum-packages-traceback' into maint
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/Yum.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py index 20103820c..b877e7541 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py @@ -1403,10 +1403,15 @@ class YumSource(Source): arch = [a for a in self.arches if a in metadata.groups] if not arch: return False - return ((package in self.packages['global'] or - package in self.packages[arch[0]]) and - package not in self.blacklist and - (len(self.whitelist) == 0 or package in self.whitelist)) + try: + return ((package in self.packages['global'] or + package in self.packages[arch[0]]) and + package not in self.blacklist and + (len(self.whitelist) == 0 or package in self.whitelist)) + except KeyError: + self.logger.debug("Packages: Unable to find %s for arch %s" % + (package, arch[0])) + return False is_package.__doc__ = Source.is_package.__doc__ def get_vpkgs(self, metadata): |