[yum-cvs] yum/yum packageSack.py,1.14,1.15

[Jack Neely]

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

Modified Files:
	packageSack.py 
Log Message:
Found a few more returnPackageTuple() methods and replaced with po.pkgtup


Index: packageSack.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/packageSack.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- packageSack.py	29 Aug 2006 06:47:47 -0000	1.14
+++ packageSack.py	29 Aug 2006 14:27:51 -0000	1.15
@@ -427,14 +427,13 @@
         """returns a dict of obsoletes dict[obsoleting pkgtuple] = [list of obs]"""
         obs = {}
         for po in self.returnPackages():
-            pkgtuple = po.returnPackageTuple()
             if len(po.returnPrco('obsoletes')) == 0:
                 continue
 
-            if not obs.has_key(pkgtuple):
-                obs[pkgtuple] = po.returnPrco('obsoletes')
+            if not obs.has_key(po.pkgtup):
+                obs[po.pkgtup] = po.returnPrco('obsoletes')
             else:
-                obs[pkgtuple].extend(po.returnPrco('obsoletes'))
+                obs[po.pkgtup].extend(po.returnPrco('obsoletes'))
         
         return obs
         
@@ -602,7 +601,7 @@
         
         simplelist = []
         for pkg in self.returnPackages():
-            simplelist.append(pkg.returnPackageTuple())
+            simplelist.append(pkg.pkgtup)
         
         self.pkglist = simplelist
         return simplelist