From eb92d4866a208c12ab89fdc1d5dc50eaeee3dd32 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Fri, 29 May 2009 20:52:32 +0000 Subject: Packages: Fix cases where arch group mappings are unexpected git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5265 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Plugins/Packages.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/lib/Server') diff --git a/src/lib/Server/Plugins/Packages.py b/src/lib/Server/Plugins/Packages.py index 43fd9cf6b..010283fe9 100644 --- a/src/lib/Server/Plugins/Packages.py +++ b/src/lib/Server/Plugins/Packages.py @@ -181,12 +181,17 @@ class YUMSource(Source): self.provides[arch][prov].append(pkgname) def is_package(self, metadata, item): - arch = [a for a in self.arches if a in metadata.groups][0] - return item in self.packages['global'] or item in self.packages[arch] + arch = [a for a in self.arches if a in metadata.groups] + if not arch: + return False + return item in self.packages['global'] or item in self.packages[arch[0]] def get_provides(self, metadata, required): ret = set() - arch = [a for a in self.arches if a in metadata.groups][0] + arches = [a for a in self.arches if a in metadata.groups] + if not arches: + raise NoData + arch = arches[0] if required in self.provides['global']: ret.update(Source.get_provides(self, metadata, required)) elif required in self.provides[arch]: -- cgit v1.2.3-1-g7c22