[yum-cvs] yum/yum depsolve.py,1.91,1.92 misc.py,1.15,1.16

[Seth Vidal]

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

Modified Files:
	depsolve.py misc.py 
Log Message:

cleaned up some other uses of compareEVR()


Index: depsolve.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/depsolve.py,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- depsolve.py	21 Aug 2006 16:48:49 -0000	1.91
+++ depsolve.py	22 Aug 2006 04:45:17 -0000	1.92
@@ -570,14 +570,10 @@
         
             tspkgs = []
             if not self.allowedMultipleInstalls(pkg):
-                (n, a, e, v, r) = pkg.pkgtup
-                
                 # from ts
                 tspkgs = self.tsInfo.matchNaevr(name=pkg.name, arch=pkg.arch)
                 for tspkg in tspkgs:
-                    (tn, ta, te, tv, tr) = tspkg.pkgtup
-                    rc = rpmUtils.miscutils.compareEVR((e, v, r), (te, tv, tr))
-                    if rc < 0:
+                    if tspkg > pkg:
                         msg = 'Potential resolving package %s has newer instance in ts.' % pkg
                         self.verbose_logger.log(logginglevels.DEBUG_2, msg)
                         provSack.delPackage(pkg)
@@ -586,9 +582,7 @@
                 # from rpmdb
                 dbpkgs = self.rpmdb.searchNevra(name=pkg.name, arch=pkg.arch)
                 for dbpkg in dbpkgs:
-                    (dn, da, de, dv, dr) = dbpkg.pkgtup
-                    rc = rpmUtils.miscutils.compareEVR((e, v, r), (de, dv, dr))
-                    if rc < 0:
+                    if dbpkg > pkg:
                         msg = 'Potential resolving package %s has newer instance installed.' % pkg
                         self.verbose_logger.log(logginglevels.DEBUG_2, msg)
                         provSack.delPackage(pkg)

Index: misc.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/misc.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- misc.py	13 Jun 2006 18:00:03 -0000	1.15
+++ misc.py	22 Aug 2006 04:45:17 -0000	1.16
@@ -13,8 +13,6 @@
 import pwd
 from stat import *
 
-import rpmUtils
-from rpmUtils.miscutils import compareEVR
 from Errors import MiscError
 
 ###########
@@ -301,12 +299,11 @@
 def newestInList(pkgs):
     # return the newest in the list of packages
     ret = [ pkgs.pop() ]
-    newest = ret[0].returnEVR()
+    newest = ret[0]
     for pkg in pkgs:
-        rc = compareEVR(pkg.returnEVR(), newest)
-        if rc > 0:
+        if pkg > newest:
             ret = [ pkg ]
-            newest = pkg.returnEVR()
-        elif rc == 0:
+            newest = pkg
+        elif pkg == newest:
             ret.append(pkg)
     return ret