extras-repoclosure repoclosure.patch,1.3,1.4

[Michael Schwendt (mschwendt)]

Author: mschwendt

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

Modified Files:
	repoclosure.patch 
Log Message:
update patch against repoclosure release

repoclosure.patch:

Index: repoclosure.patch
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/repoclosure.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- repoclosure.patch	19 May 2006 22:53:12 -0000	1.3
+++ repoclosure.patch	24 Jun 2006 19:09:01 -0000	1.4
@@ -1,5 +1,5 @@
 --- /usr/bin/repoclosure	2006-05-07 04:20:57.000000000 +0200
-+++ rc-modified	2006-05-20 00:53:04.000000000 +0200
++++ rc-modified	2006-06-19 22:10:24.000000000 +0200
 @@ -43,6 +43,8 @@
          help="specify repo ids to query, can be specified multiple times (default is all enabled)")
      parser.add_option("-t", "--tempcache", default=False, action="store_true", 
@@ -9,7 +9,7 @@
      parser.add_option("-q", "--quiet", default=0, action="store_true", 
                        help="quiet (no output to stderr)")
      parser.add_option("-n", "--newest", default=0, action="store_true",
-@@ -88,7 +90,10 @@
+@@ -88,14 +90,32 @@
          unresolved = {}
          resolved = {}
          if newest:
@@ -21,7 +21,29 @@
          else:
              pkgs = self.pkgSack
  
-@@ -144,11 +149,14 @@
+         mypkgSack = ListPackageSack(pkgs)
+         pkgtuplist = mypkgSack.simplePkgList()
+         
++        # Support new checkForObsolete code in Yum (#190116)
++        # _if available_
++        # so we don't examine old _obsolete_ sub-packages.
++        import rpmUtils.updates
++        self.up = rpmUtils.updates.Updates([],pkgtuplist)
++        self.up.rawobsoletes = mypkgSack.returnObsoletes()
++
+         for pkg in pkgs:
++            thispkgobsdict = {}
++            try:
++                thispkgobsdict = self.up.checkForObsolete([pkg.pkgtup])
++                if thispkgobsdict.has_key(pkg.pkgtup):
++                    continue
++            except:
++                pass
++
+             for (req, flags, (reqe, reqv, reqr)) in pkg.returnPrco('requires'):
+                 if req.startswith('rpmlib'): continue # ignore rpmlib deps
+             
+@@ -144,11 +164,14 @@
              else:
                  repo.enable()
  
@@ -41,7 +63,7 @@
              
          my.repos.setCacheDir(cachedir)
  
-@@ -167,7 +175,11 @@
+@@ -167,7 +190,11 @@
  
      baddeps = my.getBrokenDeps(opts.newest)
      if opts.newest:
@@ -54,7 +76,7 @@
      else:
          num = len(my.pkgSack)
          
-@@ -182,7 +194,8 @@
+@@ -182,7 +209,8 @@
      pkgs = baddeps.keys()
      pkgs.sort()
      for pkg in pkgs:
@@ -64,7 +86,7 @@
          for (n, f, v) in baddeps[pkg]:
              req = '%s' % n
              if f: 
-@@ -192,6 +205,7 @@
+@@ -192,6 +220,7 @@
                  req = '%s %s' % (req, v)
              
              print '     %s' % req