summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/emerge9
1 files changed, 4 insertions, 5 deletions
diff --git a/bin/emerge b/bin/emerge
index 931b04132..543309d4f 100755
--- 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}))