extras-repoclosure rc-modified,1.25,1.26

[Michael Schwendt]

Author: mschwendt

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

Modified Files:
	rc-modified 
Log Message:
enhance the check of providers that are obsoleted by other pkgs


Index: rc-modified
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-modified,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- rc-modified	2 Apr 2009 20:46:56 -0000	1.25
+++ rc-modified	30 Apr 2009 12:11:29 -0000	1.26
@@ -227,18 +227,23 @@
                     resolved_by_newest = False
                     for po in resolve_sack:# look through and make sure any of our answers are newest-only
 
-                        # 2nd stage handling of obsoletes. Only keep providers,
-                        # which are not obsolete. If no provider is left, the
-                        # dep is unresolved.
+                        # 2nd stage handling of obsoletes. If provider is
+                        # obsolete, check that a pkg which obsoletes it,
+                        # is newest.
                         thispkgobsdict = {}
                         if haveCheckForObsolete:
                             try:
                                 thispkgobsdict = self.up.checkForObsolete([po.pkgtup])
                                 if thispkgobsdict.has_key(po.pkgtup):
-                                    continue
+                                    for pkgtup in thispkgobsdict[po.pkgtup]:
+                                        if pkgtup in pkgtuplist:
+                                            resolved_by_newest = True
+                                            break
                             except AttributeError:
                                 pass
                         
+                        if resolved_by_newest:
+                            break
                         if po.pkgtup in pkgtuplist:
                             if not self.rawhidehack:
                                 resolved_by_newest = True