Use pkgcmp() instead of == and best() for correctness in case of implicit
authorZac Medico <zmedico@gentoo.org>
Tue, 1 Apr 2008 21:58:37 +0000 (21:58 -0000)
committerZac Medico <zmedico@gentoo.org>
Tue, 1 Apr 2008 21:58:37 +0000 (21:58 -0000)
-r0.

svn path=/main/trunk/; revision=9672

pym/portage/__init__.py

index 53efef3e636e2f80d6ed91cb46f30681a97652f0..ef2d65f0c198289022c0f7aa31c1971b3823a420 100644 (file)
@@ -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