When deps are forced to be satisfied by installed packages due to masking

or unavailability, only tolerate it when the atom comes from either the
system or world set since otherwise it's a good idea to bail so that the
user can correct the problem. (trunk r9656)

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

diff --git a/bin/emerge b/bin/emerge
index 931b04132cba31bb27af82959acf3889f3bc9236..543309d4f8eaaae821eb54c68bfd68cda57e6263 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -2076,12 +2076,9 @@ class depgraph:
                                        return False, myfavorites
 
                                if pkg.installed and "selective" not in self.myparams:
-                                       # Previous behavior was to bail out in this case, but
-                                       # since the dep is satisfied by the installed package,
-                                       # it's more friendly to continue building the graph
-                                       # and just show a warning message.
                                        self._unsatisfied_deps_for_display.append(
                                                ((myroot, myatom), {"myparent":None}))
+                                       return 0, myfavorites
 
                                try:
                                        self.mysd = self.create(pkg, None)
@@ -3104,7 +3101,9 @@ class depgraph:
                                # Previous behavior was to bail out in this case, but
                                # since the dep is satisfied by the installed package,
                                # it's more friendly to continue building the graph
-                               # and just show a warning message.
+                               # and just show a warning message. Therefore, only bail
+                               # out here if the atom is not from either the system or
+                               # world set.
                                self._unsatisfied_deps_for_display.append(
                                        ((myroot, mydep), {"myparent":None}))