[yum-cvs] yum/yum __init__.py,1.229,1.230 depsolve.py,1.86,1.87

[Seth Vidal]

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

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

a few more fixes
getInstalledPackageObject should probably be deprecated, too


Index: __init__.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/__init__.py,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- __init__.py	20 Aug 2006 13:52:03 -0000	1.229
+++ __init__.py	20 Aug 2006 14:02:47 -0000	1.230
@@ -1521,9 +1521,7 @@
     def getInstalledPackageObject(self, pkgtup):
         """returns a YumInstallPackage object for the pkgtup specified"""
         
-        hdrs = self.rpmdb.returnHeaderByTuple(pkgtup)
-        hdr = hdrs[0]
-        po = YumInstalledPackage(hdr)
+        po = self.rpmdb.packagesByTuple(pkgtup)[0] # take the first one
         return po
         
     def gpgKeyCheck(self):

Index: depsolve.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/depsolve.py,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- depsolve.py	20 Aug 2006 13:52:03 -0000	1.86
+++ depsolve.py	20 Aug 2006 14:02:47 -0000	1.87
@@ -291,10 +291,9 @@
         dumbmatchpkgs = self.rpmdb.returnTupleByKeyword(name=name, ver=version, rel=release)
         for pkgtuple in dumbmatchpkgs:
             self.verbose_logger.log(logginglevels.DEBUG_3,
-                'Calling rpmdb.returnHeaderByTuple on %s.%s %s:%s-%s', pkgtuple)
-            hdrs = self.rpmdb.returnHeaderByTuple(pkgtuple)
-            for hdr in hdrs:
-                po = packages.YumInstalledPackage(hdr)
+                '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)
@@ -435,10 +434,12 @@
             
             if thismode is not None:
                 needmode = thismode
-                try:
-                    needpo = self.getInstalledPackageObject(insttuple)
-                except KeyError:
+                if self.rpmdb.installed(name=i_n, arch=i_a, ver=i_v, 
+                                        epoch=i_e, rel=i_r):
+                    needpo = self.rpmdb.packagesByTuple(insttuple)[0]
+                else:
                     needpo = self.getPackageObject(insttuple)
+
                 self.cheaterlookup[(needname, needflags, needversion)] = insttuple
                 self.verbose_logger.log(logginglevels.DEBUG_2, 'Mode is %s for provider of %s: %s',
                     needmode, niceformatneed, inst_str)