[yum-cvs] yum cli.py,1.229,1.230

Tambet Ingo tambet at linux.duke.edu
Fri Aug 25 17:30:18 UTC 2006


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

Modified Files:
	cli.py 
Log Message:
2006-08-25  Tambet Ingo  <tambet at ximian.com>

	* cli.py (YumBaseCli.installPkgs): Use objects instead of tuples,
	comparision works only with objects.


Index: cli.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/cli.py,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- cli.py	23 Aug 2006 11:59:56 -0000	1.229
+++ cli.py	25 Aug 2006 17:30:16 -0000	1.230
@@ -767,7 +767,7 @@
                 comparable = []
                 for instpo in installedByKey:
                     if rpmUtils.arch.isMultiLibArch(instpo.arch) == rpmUtils.arch.isMultiLibArch(pkg.arch):
-                        comparable.append(instpo.pkgtup)
+                        comparable.append(instpo)
                     else:
                         self.verbose_logger.log(logginglevels.DEBUG_3,
                             'Discarding non-comparable pkg %s.%s', instpo.name, instpo.arch)
@@ -789,7 +789,7 @@
                                            # the user explicitly wants this version
                                            # FIXME this is untrue if the exactmatch
                                            # does not include a version-rel section
-                            if pkg.pkgtup in exactmatch:
+                            if pkg in exactmatch:
                                 if not toBeInstalled.has_key(pkg.name): toBeInstalled[pkg.name] = []
                                 toBeInstalled[pkg.name].append(pkg)
                 else: # we've not got any installed that match n or n+a




More information about the Yum-cvs-commits mailing list