[yum-cvs] yum/yum __init__.py,1.127,1.128

Seth Vidal skvidal at login.linux.duke.edu
Tue Jun 28 18:24:57 UTC 2005


Update of /home/groups/yum/cvs/yum/yum
In directory login:/tmp/cvs-serv10881/yum

Modified Files:
	__init__.py 
Log Message:

when you're sorting a package Sack it is best if you've put packages into
it. la la la 


Index: __init__.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/__init__.py,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- __init__.py	23 Jun 2005 04:11:10 -0000	1.127
+++ __init__.py	28 Jun 2005 18:24:55 -0000	1.128
@@ -1306,17 +1306,25 @@
         except Errors.YumBaseError, e:
             raise Errors.YumBaseError, 'No Package found for %s' % depstring
         
+        result = self.bestPackageFromList(pkglist)
+        if result is None:
+            raise Errors.YumBaseError, 'No Package found for %s' % depstring
         
-        return self.bestPackageFromList(pkglist)
+        return result
         
     def bestPackageFromList(self, pkglist):
         """take list of package objects and return the best package object.
            If the list is empty, raise Errors.YumBaseError"""
         
+        
+        if len(pkglist) == 0:
+            return None
+            
         if len(pkglist) == 1:
             return pkglist[0]
         
-        mysack = ListPackageSack() 
+        mysack = ListPackageSack()
+        mysack.addList(pkglist)
         bestlist = mysack.returnNewestByNameArch() # get rid of all lesser vers
         
         best = bestlist[0]




More information about the Yum-cvs-commits mailing list