[yum-cvs] yum/rpmUtils transaction.py,1.22,1.23

[Seth Vidal]

Update of /home/groups/yum/cvs/yum/rpmUtils
In directory login1.linux.duke.edu:/tmp/cvs-serv3006/rpmUtils

Modified Files:
	transaction.py 
Log Message:

add David Lutterkort's patch to fix returnLeafNodes to include packages
that are required only by themselves.



Index: transaction.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/rpmUtils/transaction.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- transaction.py	27 Mar 2005 04:42:09 -0000	1.22
+++ transaction.py	10 Feb 2006 05:53:43 -0000	1.23
@@ -13,6 +13,7 @@
 
 import rpm
 import miscutils
+from sets import Set
 
 read_ts = None
 ts = None
@@ -109,7 +110,9 @@
             if not h[rpm.RPMTAG_REQUIRENAME]:
                 continue
             for r in h[rpm.RPMTAG_REQUIRENAME]:
-                req[r] = tup
+                if not req.has_key(r):
+                    req[r] = Set()
+                req[r].add(tup)
      
      
         mi = self.dbMatch()
@@ -121,7 +124,10 @@
             tup = miscutils.pkgTupleFromHeader(h)
             for p in h[rpm.RPMTAG_PROVIDES] + h[rpm.RPMTAG_FILENAMES]:
                 if req.has_key(p):
-                    preq = preq + 1
+                    # Don't count a package that provides its require
+                    s = req[p]
+                    if len(s) > 1 or tup not in s:
+                        preq = preq + 1
         
             if preq == 0:
                 orphan.append(tup)