yum bestPackagesFromList takes an arch argument. Fixes ppc64 bug

This commit is contained in:
jkeating@reducto.boston.redhat.com 2007-02-06 13:51:53 -05:00 committed by Jesse Keating
parent 78d7d7c613
commit 8a7700a4a1
2 changed files with 7 additions and 1 deletions

View File

@ -1,3 +1,6 @@
* Tue Feb 06 2007 Jesse Keating <jkeating@redhat.com>
- yum bestPackagesFromList takes an arch argument. Fixes ppc64 bug
* Sat Feb 03 2007 Jesse Keating <jkeating@redhat.com> * Sat Feb 03 2007 Jesse Keating <jkeating@redhat.com>
- Be able to opt-out of a bugurl since buildinstall supports this - Be able to opt-out of a bugurl since buildinstall supports this
- Make isodir an object of pungi (wwoods) - Make isodir an object of pungi (wwoods)

View File

@ -29,10 +29,13 @@ class Gather(yum.YumBase):
self.doRpmDBSetup() self.doRpmDBSetup()
if config.get('default', 'arch') == 'i386': if config.get('default', 'arch') == 'i386':
arches = yum.rpmUtils.arch.getArchList('i686') arches = yum.rpmUtils.arch.getArchList('i686')
self.compatarch = 'i686'
elif config.get('default', 'arch') == 'ppc': elif config.get('default', 'arch') == 'ppc':
arches = yum.rpmUtils.arch.getArchList('ppc64') arches = yum.rpmUtils.arch.getArchList('ppc64')
self.compatarch = 'ppc64'
else: else:
arches = yum.rpmUtils.arch.getArchList(config.get('default', 'arch')) arches = yum.rpmUtils.arch.getArchList(config.get('default', 'arch'))
self.compatarch = config.get('default', 'arch')
self.doSackSetup(arches) self.doSackSetup(arches)
self.doSackFilelistPopulate() self.doSackFilelistPopulate()
self.logger = yum.logging.getLogger("yum.verbose.pungi") self.logger = yum.logging.getLogger("yum.verbose.pungi")
@ -57,7 +60,7 @@ class Gather(yum.YumBase):
satisfiers.append(po) satisfiers.append(po)
if satisfiers: if satisfiers:
bestlist = self.bestPackagesFromList(satisfiers) bestlist = self.bestPackagesFromList(satisfiers, arch=self.compatarch)
return bestlist return bestlist
return None return None