From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 3 May 2008 21:57:15 +0000 (-0000)
Subject: When a --resume list is rejected due to unsatisfied deps, display a
X-Git-Tag: v2.2_pre6~23
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7cc987fcf81e5be6c6868f30b3bba61cc1f916cc;p=portage.git

When a --resume list is rejected due to unsatisfied deps, display a
list of missing deps and which packages they belong to.

svn path=/main/trunk/; revision=10143
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index a76d73cbf..2a4db0585 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -4839,7 +4839,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()
@@ -7779,9 +7779,14 @@ def action_build(settings, trees, mtimedb,
 			out = EOutput()
 
 			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 " + \