[yum-cvs] yum cli.py,1.228,1.229 yum-updatesd.py,1.16,1.17

[Seth Vidal]

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

Modified Files:
	cli.py yum-updatesd.py 
Log Message:

s/packagesByTuple/searchPkgTuple/ - Thanks to Tim Lauridsen



Index: cli.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/cli.py,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- cli.py	22 Aug 2006 04:34:26 -0000	1.228
+++ cli.py	23 Aug 2006 11:59:56 -0000	1.229
@@ -852,7 +852,7 @@
         if len(userlist) == 0: # simple case - do them all
             for (obsoleting, installed) in obsoletes:
                 obsoleting_pkg = self.getPackageObject(obsoleting)
-                installed_pkg =  self.rpmdb.packagesByTuple(installed)[0]
+                installed_pkg =  self.rpmdb.searchPkgTuple(installed)[0]
                 self.tsInfo.addObsoleting(obsoleting_pkg, installed_pkg)
                 self.tsInfo.addObsoleted(installed_pkg, obsoleting_pkg)
                                 
@@ -863,7 +863,7 @@
                     self.verbose_logger.log(logginglevels.DEBUG_2, 'Not Updating Package that is already obsoleted: %s.%s %s:%s-%s', old)
                 else:
                     updating_pkg = self.getPackageObject(new)
-                    updated_pkg = self.rpmdb.packagesByTuple(old)[0]
+                    updated_pkg = self.rpmdb.searchPkgTuple(old)[0]
                     self.tsInfo.addUpdate(updating_pkg, updated_pkg)
 
 
@@ -898,7 +898,7 @@
             for po in updateMatches:
                 for (new, old) in updates:
                     if po.pkgtup == new:
-                        updated_pkg = self.rpmdb.packagesByTuple(old)[0]
+                        updated_pkg = self.rpmdb.searchPkgTuple(old)[0]
                         self.tsInfo.addUpdate(po, updated_pkg)
 
 

Index: yum-updatesd.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum-updatesd.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- yum-updatesd.py	20 Aug 2006 13:52:03 -0000	1.16
+++ yum-updatesd.py	23 Aug 2006 11:59:56 -0000	1.17
@@ -342,13 +342,13 @@
         self.updateInfo = []
         for (new, old) in self.up.getUpdatesTuples():
             n = getDbusPackageDict(self.getPackageObject(new))
-            o = getDbusPackageDict(self.rpmdb.packagesByTuple(old)[0])
+            o = getDbusPackageDict(self.rpmdb.searchPkgTuple(old)[0])
             self.updateInfo.append((n, o))
 
         if self.conf.obsoletes:
             for (obs, inst) in self.up.getObsoletesTuples():
                 n = getDbusPackageDict(self.getPackageObject(obs))
-                o = getDbusPackageDict(self.rpmdb.packagesByTuple(inst)[0])
+                o = getDbusPackageDict(self.rpmdb.searchPkgTuple(inst)[0])
                 self.updateInfo.append((n, o))
 
         self.updateInfoTime = time.time()
@@ -357,7 +357,7 @@
         # figure out the updates
         for (new, old) in self.up.getUpdatesTuples():
             updating = self.getPackageObject(new)
-            updated = self.rpmdb.packagesByTuple(old)[0]
+            updated = self.rpmdb.searchPkgTuple(old)[0]
                 
             self.tsInfo.addUpdate(updating, updated)
 
@@ -365,7 +365,7 @@
         if self.conf.obsoletes:
             for (obs, inst) in self.up.getObsoletesTuples():
                 obsoleting = self.getPackageObject(obs)
-                installed = self.rpmdb.packagesByTuple(inst)[0]
+                installed = self.rpmdb.searchPkgTuple(inst)[0]
                 
                 self.tsInfo.addObsoleting(obsoleting, installed)
                 self.tsInfo.addObsoleted(installed, obsoleting)