Prevent some more visible downgrades from possibly being missed (bug #219369).

(trunk r10033:10035)

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

diff --git a/bin/emerge b/bin/emerge
index 34b57fde37bcaf135b315ffa5c811eb6da031c3a..e2c20582cbdaa9bd2ce397312e19c4c779cff9ed 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -2933,7 +2933,10 @@ class depgraph(object):
                                        # Make --noreplace take precedence over --newuse.
                                        if not installed and noreplace and \
                                                cpv in vardb.match(atom):
-                                               break
+                                               # If the installed version is masked, it may
+                                               # be necessary to look at lower versions,
+                                               # in case there is a visible downgrade.
+                                               continue
                                        reinstall_for_flags = None
                                        cache_key = (pkg_type, root, cpv, pkg_status)
                                        calculated_use = True
@@ -3091,7 +3094,10 @@ class depgraph(object):
                                                if not reinstall_for_flags and \
                                                        not must_reinstall and \
                                                        cpv in vardb.match(atom):
-                                                       break
+                                                       # 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)