| 1 |
Author: zmedico |
| 2 |
Date: 2008-04-27 19:52:09 +0000 (Sun, 27 Apr 2008) |
| 3 |
New Revision: 10001 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Bug #219369 - Enable automatic upgrage or downgrade to a version |
| 9 |
with visible KEYWORDS when the installed version is masked by |
| 10 |
KEYWORDS, but never reinstall the same exact version only due to |
| 11 |
a KEYWORDS mask. |
| 12 |
|
| 13 |
|
| 14 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 15 |
=================================================================== |
| 16 |
--- main/trunk/pym/_emerge/__init__.py 2008-04-27 15:38:38 UTC (rev 10000) |
| 17 |
+++ main/trunk/pym/_emerge/__init__.py 2008-04-27 19:52:09 UTC (rev 10001) |
| 18 |
@@ -2795,6 +2795,26 @@ |
| 19 |
continue |
| 20 |
except portage.exception.InvalidDependString: |
| 21 |
continue |
| 22 |
+ |
| 23 |
+ # Enable upgrage or downgrade to a version |
| 24 |
+ # with visible KEYWORDS when the installed |
| 25 |
+ # version is masked by KEYWORDS, but never |
| 26 |
+ # reinstall the same exact version only due |
| 27 |
+ # to a KEYWORDS mask. |
| 28 |
+ if installed and matched_packages and \ |
| 29 |
+ pkgsettings.getMissingKeywords( |
| 30 |
+ pkg.cpv, pkg.metadata): |
| 31 |
+ different_version = None |
| 32 |
+ for avail_pkg in matched_packages: |
| 33 |
+ if not portage.dep.cpvequal( |
| 34 |
+ pkg.cpv, avail_pkg.cpv): |
| 35 |
+ different_version = avail_pkg |
| 36 |
+ break |
| 37 |
+ if different_version is not None: |
| 38 |
+ # Only reinstall for KEYWORDS if |
| 39 |
+ # it's not the same version. |
| 40 |
+ continue |
| 41 |
+ |
| 42 |
if not built and not calculated_use: |
| 43 |
# This is avoided whenever possible because |
| 44 |
# it's expensive. |
| 45 |
|
| 46 |
-- |
| 47 |
gentoo-commits@l.g.o mailing list |
Archives