From 1862a43a41c221b30ec7ac4f281098c6e229aba3 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 4 May 2008 05:51:51 +0000 Subject: [PATCH] When a --resume list is rejected due to unsatisfied deps, display a list of missing deps and which packages they belong to. (trunk r10143) svn path=/main/branches/2.1.2/; revision=10164 --- bin/emerge | 11 ++++++++--- 1 file 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 " + \ -- 2.26.2