Bug #220689 - Fix package selection logic so that it doesn't trigger the

code path from bug 219369 in some unwanted cases. (trunk r10233)

svn path=/main/branches/2.1.2/; revision=10234

diff --git a/bin/emerge b/bin/emerge
index 61031a4772e10fb33daec72310cd89297cb01aff..c926f8c36c012f7af4a113979d0577e0efcdc7d7 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -3252,16 +3252,6 @@ class depgraph(object):
                                                        cur_use, cur_iuse)
                                                if reinstall_for_flags:
                                                        reinstall = True
-                                       if not installed:
-                                               must_reinstall = empty or \
-                                                       (myarg and not selective)
-                                               if not reinstall_for_flags and \
-                                                       not must_reinstall and \
-                                                       cpv in vardb.match(atom):
-                                                       # If the installed version is masked, it may
-                                                       # be necessary to look at lower versions,
-                                                       # in case there is a visible downgrade.
-                                                       continue
                                        if not built:
                                                myeb = cpv
                                        matched_packages.append(pkg)