diff options
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/bin/emerge b/bin/emerge index 393c32a5f..2e9b0d0c2 100755 --- a/bin/emerge +++ b/bin/emerge @@ -5071,7 +5071,7 @@ class depgraph(object): # resume list invalid, so convert it to a # UnsatisfiedResumeDep exception. raise self.UnsatisfiedResumeDep( - self._unsatisfied_deps[0].atom) + self._unsatisfied_deps) self._serialized_tasks_cache = None try: self.altlist() @@ -7882,9 +7882,14 @@ def action_build(settings, trees, mtimedb, out.eerror("") if isinstance(e, mydepgraph.UnsatisfiedResumeDep): - out.eerror("An expected dependency " + \ - "is not installed: %s" % str(e)) + out.eerror("One or more expected dependencies " + \ + "are not installed:") out.eerror("") + indent = " " + for dep in e.value: + out.eerror(indent + str(dep.atom) + " pulled in by:") + out.eerror(2 * indent + str(dep.parent)) + out.eerror("") msg = "The resume list contains packages " + \ "with dependencies that have not been " + \ "installed yet. Please restart/continue " + \ |