[yum-cvs] yum/yum depsolve.py,1.168,1.169

[Jeremy Katz]

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

Modified Files:
	depsolve.py 
Log Message:
fix a case where we could traceback on not finding anything to update to
get us out of a conflicts situation (rh#244488)


Index: depsolve.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/depsolve.py,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- depsolve.py	13 Jun 2007 17:52:02 -0000	1.168
+++ depsolve.py	18 Jun 2007 21:27:28 -0000	1.169
@@ -647,7 +647,11 @@
             # if there's an update for the reqpkg, then update it
             if len(uplist) > 0:
                 if confpkg.name not in self.conf.exactarchlist:
-                    pkgs = self.pkgSack.returnNewestByName(confpkg.name)
+                    try:
+                        pkgs = self.pkgSack.returnNewestByName(confpkg.name)
+                    except PackageSackError:
+                        self.verbose_logger.log(logginglevels.DEBUG_4, "unable to find newer package for %s" %(confpkg.name,))
+                        pkgs = []
                     archs = {}
                     for pkg in pkgs:
                         (n,a,e,v,r) = pkg.pkgtup
@@ -655,8 +659,12 @@
                     a = rpmUtils.arch.getBestArchFromList(archs.keys())
                     po = archs[a]
                 else:
-                    po = self.pkgSack.returnNewestByNameArch((confpkg.name,confpkg.arch))[0]
-                if po.pkgtup not in uplist:
+                    try:
+                        po = self.pkgSack.returnNewestByNameArch((confpkg.name,confpkg.arch))[0]
+                    except PackageSackError:
+                        self.verbose_logger.log(logginglevels.DEBUG_4, "unable to find newer package for %s.%s" %(confpkg.name,confpkg.arch))
+                        po = None
+                if po and po.pkgtup not in uplist:
                     po = None
 
         if po: