From 3806c9f6696eeb4d6a0de3d1ce43a80309caf04a Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 27 Apr 2008 19:56:50 +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. (trunk r10001) svn path=/main/branches/2.1.2/; revision=10002 --- bin/emerge | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'bin') diff --git a/bin/emerge b/bin/emerge index 8fddb1b1c..d21b444ee 100755 --- a/bin/emerge +++ b/bin/emerge @@ -2942,6 +2942,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