[yum-cvs] yum/yum __init__.py, 1.233, 1.234 depsolve.py, 1.92, 1.93 packages.py, 1.53, 1.54

[Seth Vidal]

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

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

s/packagesByTuple/searchPkgTuple/ - Thanks to Tim Lauridsen



Index: __init__.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/__init__.py,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- __init__.py	21 Aug 2006 23:54:13 -0000	1.233
+++ __init__.py	23 Aug 2006 11:59:56 -0000	1.234
@@ -1046,7 +1046,7 @@
             for (pkgtup, instTup) in self.up.getObsoletesTuples():
                 (n,a,e,v,r) = pkgtup
                 pkgs = self.pkgSack.searchNevra(name=n, arch=a, ver=v, rel=r, epoch=e)
-                instpo = self.rpmdb.packagesByTuple(instTup)[0] # the first one
+                instpo = self.rpmdb.searchPkgTuple(instTup)[0] # the first one
                 for po in pkgs:
                     obsoletes.append(po)
                     obsoletesTuples.append((po, instpo))
@@ -1524,7 +1524,7 @@
         #FIXME - this should probably emit a deprecation warning telling
         # people to just use the command below
         
-        po = self.rpmdb.packagesByTuple(pkgtup)[0] # take the first one
+        po = self.rpmdb.searchPkgTuple(pkgtup)[0] # take the first one
         return po
         
     def gpgKeyCheck(self):
@@ -1845,7 +1845,7 @@
             self.verbose_logger.log(logginglevels.DEBUG_2, 'Updating Everything')
             for (obsoleting, installed) in obsoletes:
                 obsoleting_pkg = self.getPackageObject(obsoleting)
-                installed_pkg =  self.rpmdb.packagesByTuple(installed)[0]
+                installed_pkg =  self.rpmdb.searchPkgTuple(installed)[0]
                 txmbr = self.tsInfo.addObsoleting(obsoleting_pkg, installed_pkg)
                 self.tsInfo.addObsoleted(installed_pkg, obsoleting_pkg)
                 tx_return.append(txmbr)
@@ -1856,7 +1856,7 @@
                         old)
                 else:
                     updating_pkg = self.getPackageObject(new)
-                    updated_pkg = self.rpmdb.packagesByTuple(old)[0]
+                    updated_pkg = self.rpmdb.searchPkgTuple(old)[0]
                     txmbr = self.tsInfo.addUpdate(updating_pkg, updated_pkg)
                     tx_return.append(txmbr)
             
@@ -1913,7 +1913,7 @@
                         self.verbose_logger.log(logginglevels.DEBUG_2, 'Not Updating Package that is already obsoleted: %s.%s %s:%s-%s', 
                             updated)
                     else:
-                        updated_pkg =  self.rpmdb.packagesByTuple(updated)[0]
+                        updated_pkg =  self.rpmdb.searchPkgTuple(updated)[0]
                         txmbr = self.tsInfo.addUpdate(available_pkg, updated_pkg)
                         tx_return.append(txmbr)
                     

Index: depsolve.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/depsolve.py,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- depsolve.py	22 Aug 2006 04:45:17 -0000	1.92
+++ depsolve.py	23 Aug 2006 11:59:56 -0000	1.93
@@ -430,7 +430,7 @@
                 needmode = thismode
                 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]
+                    needpo = self.rpmdb.searchPkgTuple(insttuple)[0]
                 else:
                     needpo = self.getPackageObject(insttuple)
 

Index: packages.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/packages.py,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- packages.py	22 Aug 2006 17:55:00 -0000	1.53
+++ packages.py	23 Aug 2006 11:59:57 -0000	1.54
@@ -203,13 +203,12 @@
         if comparePoEVR(self, other) >= 0:
             return True
         return False
-    
 
     def __eq__(self, other):
         if comparePoEVR(self, other) == 0:
             return True
         return False
-    
+
     def __ne__(self, other):
         if comparePoEVR(self, other) != 0:
             return True