| 1 |
Author: zmedico |
| 2 |
Date: 2009-10-02 19:24:44 +0000 (Fri, 02 Oct 2009) |
| 3 |
New Revision: 14472 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/depgraph.py |
| 7 |
Log: |
| 8 |
Bug #287333 - Fix the code from bug #252167 so it behaves consistently |
| 9 |
regardless of the package (ebuild or binpkg) being masked. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/_emerge/depgraph.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/_emerge/depgraph.py 2009-10-01 19:29:24 UTC (rev 14471) |
| 15 |
+++ main/trunk/pym/_emerge/depgraph.py 2009-10-02 19:24:44 UTC (rev 14472) |
| 16 |
@@ -2304,8 +2304,7 @@ |
| 17 |
reinstall_for_flags = None |
| 18 |
|
| 19 |
if not pkg.installed or \ |
| 20 |
- (pkg.built and matched_packages and \ |
| 21 |
- not (avoid_update and pkg.installed)): |
| 22 |
+ (matched_packages and not avoid_update): |
| 23 |
# Only enforce visibility on installed packages |
| 24 |
# if there is at least one other visible package |
| 25 |
# available. By filtering installed masked packages |
| 26 |
@@ -2323,8 +2322,8 @@ |
| 27 |
# with visible KEYWORDS when the installed |
| 28 |
# version is masked by KEYWORDS, but never |
| 29 |
# reinstall the same exact version only due |
| 30 |
- # to a KEYWORDS mask. |
| 31 |
- if built and matched_packages: |
| 32 |
+ # to a KEYWORDS mask. See bug #252167. |
| 33 |
+ if matched_packages: |
| 34 |
|
| 35 |
different_version = None |
| 36 |
for avail_pkg in matched_packages: |
Archives