[yum-cvs] yum/yum packageSack.py,1.17,1.18

Seth Vidal skvidal at linux.duke.edu
Fri Sep 29 04:40:12 UTC 2006


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

Modified Files:
	packageSack.py 
Log Message:

make sure we're only returning the newest from the metasack


Index: packageSack.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/packageSack.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- packageSack.py	5 Sep 2006 17:37:07 -0000	1.17
+++ packageSack.py	29 Sep 2006 04:40:10 -0000	1.18
@@ -283,14 +283,21 @@
            this means(in name.arch form): foo.i386 and foo.noarch are not
            compared to each other for highest version only foo.i386 and
            foo.i386 will be compared"""
-        return self._computeAggregateListResult("returnNewestByNameArch", naTup)
-
+        bestofeach = ListPackageSack()
+        bestofeach.addList(self._computeAggregateListResult("returnNewestByNameArch", naTup))
+        
+        return bestofeach.returnNewestByNameArch(naTup)
+        
+        
     def returnNewestByName(self, name=None):
         """return list of newest packages based on name matching
            this means(in name.arch form): foo.i386 and foo.noarch will
            be compared to each other for highest version"""
-        return self._computeAggregateListResult("returnNewestByName", name)
-
+           
+        bestofeach = ListPackageSack()
+        bestofeach.addList(self._computeAggregateListResult("returnNewestByName", name))
+        return bestofeach.returnNewestByName(name)
+        
     def simplePkgList(self):
         """returns a list of pkg tuples (n, a, e, v, r)"""
         return self._computeAggregateListResult("simplePkgList")
@@ -558,7 +565,7 @@
         
         if naTup:
             if highdict.has_key(naTup):
-                return highdict[naTup]
+                return [highdict[naTup]]
             else:
                 raise PackageSackError, 'No Package Matching %s.%s' % naTup
         




More information about the Yum-cvs-commits mailing list