diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-04-01 21:58:37 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-04-01 21:58:37 +0000 |
| commit | fce30c479e97c4ed7ee97b8e26252c9d9ba1c6a4 (patch) | |
| tree | d6481ced5534d1e153e59808bf037ac7c7538cb7 /pym | |
| parent | 365bf57da9cddcb9479d992aac30dff2e081be06 (diff) | |
| download | portage-fce30c479e97c4ed7ee97b8e26252c9d9ba1c6a4.tar.gz portage-fce30c479e97c4ed7ee97b8e26252c9d9ba1c6a4.tar.bz2 portage-fce30c479e97c4ed7ee97b8e26252c9d9ba1c6a4.zip | |
Use pkgcmp() instead of == and best() for correctness in case of implicit
-r0.
svn path=/main/trunk/; revision=9672
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/__init__.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 53efef3e6..ef2d65f0c 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -5451,8 +5451,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 |