[yum-cvs] yum/yum depsolve.py,1.105,1.106

Paul Nasrat pnasrat at linux.duke.edu
Fri Oct 13 13:12:51 UTC 2006


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

Modified Files:
	depsolve.py 
Log Message:
EVR comparison from Tim Lauridsen

Index: depsolve.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/depsolve.py,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- depsolve.py	3 Oct 2006 21:43:18 -0000	1.105
+++ depsolve.py	13 Oct 2006 13:12:49 -0000	1.106
@@ -588,7 +588,7 @@
                 # from ts
                 tspkgs = self.tsInfo.matchNaevr(name=pkg.name, arch=pkg.arch)
                 for tspkg in tspkgs:
-                    if tspkg.po > pkg:
+                    if tspkg.po.EVR > pkg.EVR:
                         msg = 'Potential resolving package %s has newer instance in ts.' % pkg
                         self.verbose_logger.log(logginglevels.DEBUG_2, msg)
                         provSack.delPackage(pkg)
@@ -597,7 +597,7 @@
                 # from rpmdb
                 dbpkgs = self.rpmdb.searchNevra(name=pkg.name, arch=pkg.arch)
                 for dbpkg in dbpkgs:
-                    if dbpkg > pkg:
+                    if dbpkg.EVR > pkg.EVR:
                         msg = 'Potential resolving package %s has newer instance installed.' % pkg
                         self.verbose_logger.log(logginglevels.DEBUG_2, msg)
                         provSack.delPackage(pkg)




More information about the Yum-cvs-commits mailing list