[yum-cvs] yum/rpmUtils updates.py,1.23.2.4,1.23.2.5

Seth Vidal skvidal at linux.duke.edu
Mon Apr 9 03:05:40 UTC 2007


Update of /home/groups/yum/cvs/yum/rpmUtils
In directory login1.linux.duke.edu:/tmp/cvs-serv14110/rpmUtils

Modified Files:
      Tag: yum-3_0_X
	updates.py 
Log Message:

make sure the pseudo-arches get this fix, too.

bugger


Index: updates.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/rpmUtils/updates.py,v
retrieving revision 1.23.2.4
retrieving revision 1.23.2.5
diff -u -r1.23.2.4 -r1.23.2.5
--- updates.py	8 Apr 2007 20:45:52 -0000	1.23.2.4
+++ updates.py	9 Apr 2007 03:05:38 -0000	1.23.2.5
@@ -394,10 +394,11 @@
         archlists = []
         if rpmUtils.arch.isMultiLibArch(arch=self.myarch):
             if rpmUtils.arch.multilibArches.has_key(self.myarch):
-                biarches = [self.myarch, 'noarch']
+                biarches = [self.myarch]
             else:
                 biarches = [self.myarch, rpmUtils.arch.arches[self.myarch]]
-
+            biarches.append('noarch')
+            
             multicompat = rpmUtils.arch.getMultiArchInfo(self.myarch)[0]
             multiarchlist = rpmUtils.arch.getArchList(multicompat)
             archlists = [ biarches, multiarchlist ]




More information about the Yum-cvs-commits mailing list