diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-11-15 20:42:35 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-11-15 20:42:35 +0000 |
| commit | d60d70436800e2a4c93e6487f621daa8735e88cf (patch) | |
| tree | ecbe68ed7c185221e03f25cacc7e8573776fb9f6 | |
| parent | 01ae8fc886a6aaf9bdf40dcf939a66a79076f1f3 (diff) | |
| download | portage-d60d70436800e2a4c93e6487f621daa8735e88cf.tar.gz portage-d60d70436800e2a4c93e6487f621daa8735e88cf.tar.bz2 portage-d60d70436800e2a4c93e6487f621daa8735e88cf.zip | |
Check the return value from depgraph._add_pkg() when adding library consumers
inside action_depclean().
svn path=/main/trunk/; revision=11953
| -rw-r--r-- | pym/_emerge/__init__.py | 7 |
1 files changed, 5 insertions, 2 deletions
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() |