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

[Seth Vidal]

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

Modified Files:
      Tag: yum-3_0_X
	updates.py 
Log Message:
closes rh bug:235632
make sure we consider noarch pkgs  when looking at things that can update
noarch->x86_64 and x86_64->noarch



Index: updates.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/rpmUtils/updates.py,v
retrieving revision 1.23.2.3
retrieving revision 1.23.2.4
diff -u -r1.23.2.3 -r1.23.2.4
--- updates.py	5 Dec 2006 14:39:34 -0000	1.23.2.3
+++ updates.py	8 Apr 2007 20:45:52 -0000	1.23.2.4
@@ -389,10 +389,12 @@
         # one for the multiarch itself and one for the compat arch
         # ie: x86_64 and athlon(i686-i386) - we don't want to descend
         # x86_64->i686 
+        # however, we do want to descend x86_64->noarch, sadly.
+        
         archlists = []
         if rpmUtils.arch.isMultiLibArch(arch=self.myarch):
             if rpmUtils.arch.multilibArches.has_key(self.myarch):
-                biarches = [self.myarch]
+                biarches = [self.myarch, 'noarch']
             else:
                 biarches = [self.myarch, rpmUtils.arch.arches[self.myarch]]
 
@@ -417,7 +419,6 @@
                 tmplist = []
                 for (a, e, v, r) in newpkgs[(n, None)]:
                     tmplist.append((n, a, e, v, r))                        
-                
                 highestavailablepkgs = self.returnHighestVerFromAllArchsByName(n,
                                          thisarchlist, tmplist)
 
@@ -451,7 +452,7 @@
                     
                     rpm_a = rpmUtils.arch.getBestArchFromList(instarchs, myarch=self.myarch)
                     a = rpmUtils.arch.getBestArchFromList(availarchs, myarch=self.myarch)
-
+                    
                     if rpm_a is None or a is None:
                         continue