[yum-cvs] yum/yum depsolve.py,1.87,1.88

[Seth Vidal]

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

Modified Files:
	depsolve.py 
Log Message:

still more cleanups for deprecation warnings


Index: depsolve.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/depsolve.py,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- depsolve.py	20 Aug 2006 14:02:47 -0000	1.87
+++ depsolve.py	20 Aug 2006 14:23:22 -0000	1.88
@@ -288,18 +288,14 @@
         
         # is the requiring tuple (name, version, release) from an installed package?
         pkgs = []
-        dumbmatchpkgs = self.rpmdb.returnTupleByKeyword(name=name, ver=version, rel=release)
-        for pkgtuple in dumbmatchpkgs:
-            self.verbose_logger.log(logginglevels.DEBUG_3,
-                'Calling rpmdb.packagesByTuple on %s.%s %s:%s-%s', pkgtuple)
-            installed_pkgs = self.rpmdb.packagesByTuple(pkgtuple)
-            for po in installed_pkgs:
-                if self.tsInfo.exists(po.pkgtup):
-                    self.verbose_logger.log(logginglevels.DEBUG_4,
-                        'Skipping package already in Transaction Set: %s', po)
-                    continue
-                if niceformatneed in po.requiresList():
-                    pkgs.append(po)
+        dumbmatchpkgs = self.rpmdb.searchNevra(name=name, ver=version, rel=release)
+        for po in dumbmatchpkgs:
+            if self.tsInfo.exists(po.pkgtup):
+                self.verbose_logger.log(logginglevels.DEBUG_4,
+                    'Skipping package already in Transaction Set: %s', po)
+                continue
+            if niceformatneed in po.requiresList():
+                pkgs.append(po)
 
         if len(pkgs) < 1: # requiring tuple is not in the rpmdb
             txmbrs = self.tsInfo.matchNaevr(name=name, ver=version, rel=release)
@@ -590,9 +586,9 @@
                         continue
                 
                 # from rpmdb
-                dbpkgs = self.rpmdb.returnTupleByKeyword(name=pkg.name, arch=pkg.arch)
-                for dbpkgtup in dbpkgs:
-                    (dn, da, de, dv, dr) = dbpkgtup
+                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:
                         msg = 'Potential resolving package %s has newer instance installed.' % pkg
@@ -692,9 +688,9 @@
         self.doUpdateSetup()
         uplist = self.up.getUpdatesList(name=confname)
         
-        conftuple = self.rpmdb.returnTupleByKeyword(name=confname)
-        if conftuple:
-            (confname, confarch, confepoch, confver, confrel) = conftuple[0] # take the first one, probably the only one
+        conflict_packages = self.rpmdb.searchNevra(name=confname)
+        if conflict_packages:
+            (confname, confarch, confepoch, confver, confrel) = conflict_packages[0] # take the first one, probably the only one
                 
 
             # if there's an update for the reqpkg, then update it