summaryrefslogtreecommitdiffstats
path: root/pym/portage.py
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-04-01 21:58:58 +0000
committerZac Medico <zmedico@gentoo.org>2008-04-01 21:58:58 +0000
commite9ad7be4e102c375ce10b61f8cc441150dc4a681 (patch)
tree39853d230133d149fdb409bfd87f4dd0a04a3db8 /pym/portage.py
parent4637db713ecfa5475495cb466ceb462e417e523a (diff)
downloadportage-e9ad7be4e102c375ce10b61f8cc441150dc4a681.tar.gz
portage-e9ad7be4e102c375ce10b61f8cc441150dc4a681.tar.bz2
portage-e9ad7be4e102c375ce10b61f8cc441150dc4a681.zip
Use pkgcmp() instead of == and best() for correctness in case of implicit
-r0. (trunk r9672) svn path=/main/branches/2.1.2/; revision=9673
Diffstat (limited to 'pym/portage.py')
-rw-r--r--pym/portage.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/portage.py b/pym/portage.py
index f764dbfc2..30b1e2b19 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -5426,8 +5426,10 @@ def dep_zapdeps(unreduced, reduced, myroot, use_binaries=0, trees=None):
for myslot in intersecting_slots:
myversion = versions[myslot]
o_version = o_versions[myslot]
- if myversion != o_version:
- if myversion == best([myversion, o_version]):
+ difference = pkgcmp(catpkgsplit(myversion)[1:],
+ catpkgsplit(o_version)[1:])
+ if difference:
+ if difference > 0:
has_upgrade = True
else:
has_downgrade = True