extras-repoclosure rc-modified,1.12,1.13

Michael Schwendt (mschwendt) fedora-extras-commits at redhat.com
Sun Jan 7 10:44:10 UTC 2007


Author: mschwendt

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

Modified Files:
	rc-modified 
Log Message:
also handle obsolete providers with the post-yum-2.6.1 code


Index: rc-modified
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-modified,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rc-modified	7 Dec 2006 11:19:13 -0000	1.12
+++ rc-modified	7 Jan 2007 10:44:08 -0000	1.13
@@ -1,4 +1,5 @@
 #!/usr/bin/python -t
+# -*- mode: Python; indent-tabs-mode: nil; -*-
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -145,6 +146,18 @@
                 if newest and not kernelprovides and not req.startswith('kernel'): # we allow old kernels
                     resolved_by_newest = False
                     for po in resolve_sack:# look through and make sure all 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.
+                        thispkgobsdict = {}
+                        try:
+                            thispkgobsdict = self.up.checkForObsolete([po.pkgtup])
+                            if thispkgobsdict.has_key(po.pkgtup):
+                                continue
+                        except:
+                            pass
+                        
                         if po.pkgtup in pkgtuplist:
                             resolved_by_newest = True
                             break




More information about the fedora-extras-commits mailing list