[yum-cvs] yum cli.py,1.241,1.242
Jeremy Katz
katzj at linux.duke.edu
Fri Oct 13 01:24:40 UTC 2006
Update of /home/groups/yum/cvs/yum
In directory login1.linux.duke.edu:/tmp/cvs-serv6216
Modified Files:
cli.py
Log Message:
fix so that foo-1.1-1.i386 != foo-1.1-1.x86_64. at the same time, move
comparison to be of an EVR object and adjust callers accordingly. patch
for EVR comparison from Tim Lauridsen
Index: cli.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/cli.py,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- cli.py 29 Sep 2006 05:41:07 -0000 1.241
+++ cli.py 13 Oct 2006 01:24:38 -0000 1.242
@@ -564,15 +564,15 @@
# go through each package
if len(comparable) > 0:
for instpo in comparable:
- if pkg > instpo: # we're newer - this is an update, pass to them
+ if pkg.EVR > instpo.EVR: # we're newer - this is an update, pass to them
if instpo.name in exactarchlist:
if pkg.arch == instpo.arch:
passToUpdate.append(pkg.pkgtup)
else:
passToUpdate.append(pkg.pkgtup)
- elif pkg == instpo: # same, ignore
+ elif pkg.EVR == instpo.EVR: # same, ignore
continue
- elif pkg < instpo: # lesser, check if the pkgtup is an exactmatch
+ elif pkg.EVR < instpo.EVR: # lesser, check if the pkgtup is an exactmatch
# if so then add it to be installed
# if it can be multiply installed
# this is where we could handle setting
@@ -775,7 +775,7 @@
continue
for installed_pkg in installedByKey:
- if po > installed_pkg: # we're newer - this is an update, pass to them
+ if po.EVR > installed_pkg.EVR: # we're newer - this is an update, pass to them
if installed_pkg.name in self.conf.exactarchlist:
if po.arch == installed_pkg.arch:
updatepkgs.append((po, installed_pkg))
More information about the Yum-cvs-commits
mailing list