Check the return value from depgraph._add_pkg() when adding library consumers
authorZac Medico <zmedico@gentoo.org>
Sat, 15 Nov 2008 20:42:35 +0000 (20:42 -0000)
committerZac Medico <zmedico@gentoo.org>
Sat, 15 Nov 2008 20:42:35 +0000 (20:42 -0000)
inside action_depclean().

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

pym/_emerge/__init__.py

index 9c90e736c23734a79c40222afa62f9f69c708833..71fa4378d8a581fa37afa9a978bf9f77593b18b6 100644 (file)
@@ -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()