extras-repoclosure rc-modified,1.22,1.23

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13718

Modified Files:
	rc-modified 
Log Message:
... and that's the infamous corner-case with noarch->arch switch of pkgs



Index: rc-modified
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-modified,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- rc-modified	7 Mar 2008 20:04:15 -0000	1.22
+++ rc-modified	7 Mar 2008 21:20:05 -0000	1.23
@@ -120,10 +120,11 @@
         # there is no upgrade path from biarch installs to single-arch
         # (the one pkg upgrades two installed pkgs with different arch)
 
-        if newest:
+        (n,a,e,v,r) = pkg.pkgtup
+
+        if newest or a=='noarch':
             return newest  # the trivial case
 
-        (n,a,e,v,r) = pkg.pkgtup
         for provpkg in self.pkgSack.returnNewestByName(n):
             prov_a = provpkg.pkgtup[1]
             if prov_a=='noarch' or prov_a==a: