From 8a7700a4a1a80df0b403c5ce61bdf34f20148056 Mon Sep 17 00:00:00 2001 From: "jkeating@reducto.boston.redhat.com" <> Date: Tue, 6 Feb 2007 13:51:53 -0500 Subject: [PATCH] yum bestPackagesFromList takes an arch argument. Fixes ppc64 bug --- Changelog | 3 +++ pypungi/gather.py | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 9fec1c72..6d5b711b 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,6 @@ +* Tue Feb 06 2007 Jesse Keating +- yum bestPackagesFromList takes an arch argument. Fixes ppc64 bug + * Sat Feb 03 2007 Jesse Keating - Be able to opt-out of a bugurl since buildinstall supports this - Make isodir an object of pungi (wwoods) diff --git a/pypungi/gather.py b/pypungi/gather.py index ead5c626..27893425 100755 --- a/pypungi/gather.py +++ b/pypungi/gather.py @@ -29,10 +29,13 @@ class Gather(yum.YumBase): self.doRpmDBSetup() if config.get('default', 'arch') == 'i386': arches = yum.rpmUtils.arch.getArchList('i686') + self.compatarch = 'i686' elif config.get('default', 'arch') == 'ppc': arches = yum.rpmUtils.arch.getArchList('ppc64') + self.compatarch = 'ppc64' else: arches = yum.rpmUtils.arch.getArchList(config.get('default', 'arch')) + self.compatarch = config.get('default', 'arch') self.doSackSetup(arches) self.doSackFilelistPopulate() self.logger = yum.logging.getLogger("yum.verbose.pungi") @@ -57,7 +60,7 @@ class Gather(yum.YumBase): satisfiers.append(po) if satisfiers: - bestlist = self.bestPackagesFromList(satisfiers) + bestlist = self.bestPackagesFromList(satisfiers, arch=self.compatarch) return bestlist return None