Fix broken dep_check() call in calc_depclean() to use

depgraph._select_atoms() instead.

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 606d685ce65f5dee54a88718836ef3feec3d21f6..f7709f0cd1e47dd26e886d3e20167bad6e45272d 100644 (file)
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -1096,21 +1096,20 @@ def calc_depclean(settings, trees, ldpath_mtimes,
                for node in clean_set:
                        graph.add(node, None)
                        mydeps = []
-                       node_use = node.metadata["USE"].split()
                        for dep_type in dep_keys:
                                depstr = node.metadata[dep_type]
                                if not depstr:
                                        continue
-                               success, atoms = portage.dep_check(depstr, None, settings,
-                                       myuse=node_use,
-                                       trees=resolver._dynamic_config._graph_trees,
-                                       myroot=myroot)
-                               if not success:
+                               priority = priority_map[dep_type]
+                               try:
+                                       atoms = resolver._select_atoms(myroot, depstr,
+                                               myuse=node.use.enabled, parent=node,
+                                               priority=priority)[node]
+                               except portage.exception.InvalidDependString:
                                        # Ignore invalid deps of packages that will
                                        # be uninstalled anyway.
                                        continue
 
-                               priority = priority_map[dep_type]
                                for atom in atoms:
                                        if not isinstance(atom, portage.dep.Atom):
                                                # Ignore invalid atoms returned from dep_check().