[yum-cvs] yum/yum depsolve.py,1.90,1.91

Jeremy Katz katzj at linux.duke.edu
Mon Aug 21 16:48:51 UTC 2006


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

Modified Files:
	depsolve.py 
Log Message:
fix a traceback due to the API changes  


Index: depsolve.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/depsolve.py,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- depsolve.py	20 Aug 2006 21:37:39 -0000	1.90
+++ depsolve.py	21 Aug 2006 16:48:49 -0000	1.91
@@ -367,8 +367,8 @@
                 rpmUtils.miscutils.formatRequire(needname, needversion, flags))
             
             requirementTuple = (needname, flags, needversion)
-            
-            CheckDeps, missingdep = self._requiringFromInstalled(requiringPkg.pkgtup,
+
+            CheckDeps, missingdep = self._requiringFromInstalled(requiringPkg.returnNevraTuple(),
                                                     requirementTuple, errormsgs)
 
 
@@ -378,10 +378,9 @@
     def _requiringFromInstalled(self, requiringPkg, requirement, errorlist):
         """processes the dependency resolution for a dep where the requiring 
            package is installed"""
-        
+
         # FIXME - should we think about dealing exclusively in package objects?
-           
-        requiringPo = self.rpmdb.searchNevra(requiringPkg)[0]
+        requiringPo = apply(self.rpmdb.searchNevra, requiringPkg)[0]
         (name, arch, epoch, ver, rel) = requiringPo.pkgtup
         
         (needname, needflags, needversion) = requirement




More information about the Yum-cvs-commits mailing list