From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 15 Nov 2008 20:42:35 +0000 (-0000)
Subject: Check the return value from depgraph._add_pkg() when adding library consumers
X-Git-Tag: v2.2_rc15~40
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d60d70436800e2a4c93e6487f621daa8735e88cf;p=portage.git

Check the return value from depgraph._add_pkg() when adding library consumers
inside action_depclean().

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 9c90e736c..71fa4378d 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -12676,9 +12676,12 @@ def action_depclean(settings, trees, ldpath_mtimes,
 				for consumer_dblink in set(chain(*consumers.values())):
 					consumer_pkg = vardb.get(("installed", myroot,
 						consumer_dblink.mycpv, "nomerge"))
-					resolver._add_pkg(pkg, Dependency(parent=consumer_pkg,
+					if not resolver._add_pkg(pkg,
+						Dependency(parent=consumer_pkg,
 						priority=UnmergeDepPriority(runtime=True),
-						root=pkg.root))
+						root=pkg.root)):
+						resolver.display_problems()
+						return 1
 
 			writemsg_level("\nCalculating dependencies  ")
 			success = resolver._complete_graph()