From d60d70436800e2a4c93e6487f621daa8735e88cf Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 15 Nov 2008 20:42:35 +0000 Subject: Check the return value from depgraph._add_pkg() when adding library consumers inside action_depclean(). svn path=/main/trunk/; revision=11953 --- pym/_emerge/__init__.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'pym/_emerge') 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() -- cgit v1.2.3-1-g7c22