From 0f19cbfa88913e79c0b82ef79fa9976ceaa21ce5 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 27 Apr 2008 19:52:09 +0000 Subject: 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 --- pym/_emerge/__init__.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index c3c4a896a..e853d8fb8 100644 --- 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. -- cgit v1.2.3-1-g7c22