extras-repoclosure rc-modified,1.33,1.34

[Michael Schwendt]

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9210

Modified Files:
	rc-modified 
Log Message:
commit the i386/i586 -> i686 upgrade hack till I find time to look at it


Index: rc-modified
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-modified,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- rc-modified	7 Sep 2009 11:56:49 -0000	1.33
+++ rc-modified	24 Feb 2010 11:15:37 -0000	1.34
@@ -166,15 +166,16 @@
 
     def hasupdate(self, pkg):
         # Ugly hack for the i386->i586 switch in F11 development.
+        # Ugly hack for the i586->i686 switch in F12 development.
         (n,a,e,v,r) = pkg.pkgtup
         for provpkg in self.pkgSack.returnNewestByName(n):
             prov_a = provpkg.pkgtup[1]
-            if prov_a=='i586':
+            if prov_a=='i586' or prov_a=='i686':
                 (prov_e, prov_v, prov_r) = provpkg.pkgtup[2:]
                 vercmp = rpmUtils.miscutils.compareEVR( (prov_e,prov_v,prov_r), (e,v,r) )
-                if vercmp>0:  # provpkg is newer, i586 updates i386
+                if vercmp>0:  # provpkg is newer, i586/i686 updates i386/i586
                     return True
-        return False  # there is no update for the i386 pkg
+        return False  # there is no update for the i386/i586 pkg
 
     def getBrokenDeps(self, newest=False):
         unresolved = {}
@@ -209,7 +210,7 @@
             print 'WARNING: rpmUtils.updates.checkForObsolete missing!'
 
         for pkg in pkgs:
-            if self.rawhidehack and pkg.pkgtup[1]=='i386' and self.hasupdate(pkg):
+            if self.rawhidehack and (pkg.pkgtup[1]=='i386' or pkg.pkgtup[1]=='i586') and self.hasupdate(pkg):
                 print 'WARNING: Skipping', pkg
                 continue
             thispkgobsdict = {}
@@ -217,6 +218,7 @@
                 try:
                     thispkgobsdict = self.up.checkForObsolete([pkg.pkgtup])
                     if thispkgobsdict.has_key(pkg.pkgtup):
+#                        print "OBSOLETE:", pkg.pkgtup
                         continue
                 except AttributeError:
                     pass
@@ -261,6 +263,7 @@
                                         if pkgtup in pkgtuplist and pkgtup in resolve_sack.simplePkgList():
                                             resolved_by_newest = True
                                             break
+#                                    print "OBSOLETE PROVIDER:", po.pkgtup
                                     continue  # Obsoletes without Provides
                             except AttributeError:
                                 pass
@@ -272,7 +275,8 @@
                                 resolved_by_newest = True
                                 break
                             # In F11 devel i386 pkgs are updated by i586.
-                            elif po.pkgtup[1]!='i386' or not self.hasupdate(po):
+                            # In F12 devel i586 pkgs are updated by i686.
+                            elif (po.pkgtup[1]!='i386' or po.pkgtup[1]!='i586') or not self.hasupdate(po):
                                 resolved_by_newest = True
                                 break