From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 29 May 2008 20:44:08 +0000 (-0000)
Subject: When --skipfirst drops packages due to unsatisfied dependencies, display
X-Git-Tag: v2.2_pre8~74
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=69a4bbd95b2f567042542984fbe27fc86b627153;p=portage.git

When --skipfirst drops packages due to unsatisfied dependencies, display
a warning message with the list of dropped packages.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index e3a588576..e405e67ae 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -8363,6 +8363,8 @@ def action_build(settings, trees, mtimedb,
 					del mergelist[i]
 					break
 
+		dropped_tasks = set()
+
 		success = False
 		try:
 			while True:
@@ -8378,11 +8380,12 @@ def action_build(settings, trees, mtimedb,
 					for task in mergelist:
 						if isinstance(task, list) and \
 							tuple(task) in unsatisfied_parents:
-								continue
+							continue
 						pruned_mergelist.append(task)
 					if not pruned_mergelist:
 						raise
 					mergelist[:] = pruned_mergelist
+					dropped_tasks.update(unsatisfied_parents)
 					del e
 					continue
 				else:
@@ -8439,7 +8442,15 @@ def action_build(settings, trees, mtimedb,
 			if show_spinner:
 				print "\b\b... done!"
 
-		if not success:
+		if success:
+			if dropped_tasks:
+				portage.writemsg("!!! One or more packages have been " + \
+					"dropped due to unsatisfied dependencies:\n\n",
+					noiselevel=-1)
+				for task in dropped_tasks:
+					portage.writemsg("  " + str(task) + "\n", noiselevel=-1)
+				portage.writemsg("\n", noiselevel=-1)
+		else:
 			mydepgraph.display_problems()
 			if not (ask or pretend):
 				# delete the current list and also the backup