Use pkgcmp() instead of == and best() for correctness in case of implicit

-r0. (trunk r9672)

svn path=/main/branches/2.1.2/; revision=9673

diff --git a/pym/portage.py b/pym/portage.py
index f764dbfc21e990d902e462bf4e08ca42c31be78c..30b1e2b19ed50fc5768e8b962609db44584f3b2d 100644 (file)
--- 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