Bug #219369 - Enable automatic upgrage or downgrade to a version

with visible KEYWORDS when the installed version is masked by
KEYWORDS, but never reinstall the same exact version only due to
a KEYWORDS mask.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index c3c4a896a325049fa8ea68f9e62b3b7ae2a5db22..e853d8fb8afcf66d1236c3d9693eb794662f0f20 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -2795,6 +2795,26 @@ class depgraph(object):
                                                                continue
                                                except portage.exception.InvalidDependString:
                                                        continue
+
+                                               # Enable upgrage or downgrade to a version
+                                               # with visible KEYWORDS when the installed
+                                               # version is masked by KEYWORDS, but never
+                                               # reinstall the same exact version only due
+                                               # to a KEYWORDS mask.
+                                               if installed and matched_packages and \
+                                                       pkgsettings.getMissingKeywords(
+                                                       pkg.cpv, pkg.metadata):
+                                                       different_version = None
+                                                       for avail_pkg in matched_packages:
+                                                               if not portage.dep.cpvequal(
+                                                                       pkg.cpv, avail_pkg.cpv):
+                                                                       different_version = avail_pkg
+                                                                       break
+                                                       if different_version is not None:
+                                                               # Only reinstall for KEYWORDS if
+                                                               # it's not the same version.
+                                                               continue
+
                                        if not built and not calculated_use:
                                                # This is avoided whenever possible because
                                                # it's expensive.