Bug #287333 - Fix the code from bug #252167 so it behaves consistently

regardless of the package (ebuild or binpkg) being masked.

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

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 9b4c0b6dd3127a9615c0b78c4523fe225e758c3f..2d47fd4675f477b139fe6051311f53028c9a0329 100644 (file)
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -2304,8 +2304,7 @@ class depgraph(object):
                                        reinstall_for_flags = None
 
                                        if not pkg.installed or \
-                                               (pkg.built and matched_packages and \
-                                               not (avoid_update and pkg.installed)):
+                                               (matched_packages and not avoid_update):
                                                # Only enforce visibility on installed packages
                                                # if there is at least one other visible package
                                                # available. By filtering installed masked packages
@@ -2323,8 +2322,8 @@ class depgraph(object):
                                                # 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 built and matched_packages:
+                                               # to a KEYWORDS mask. See bug #252167.
+                                               if matched_packages:
 
                                                        different_version = None
                                                        for avail_pkg in matched_packages: