diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-09-08 13:24:49 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-09-08 13:24:49 -0700 |
| commit | 2f17d7811b876be5dc718135f6f9bb756683169b (patch) | |
| tree | feff974bcbaedc6fa8f3a43b6bbc5b0f336eacb7 /pym | |
| parent | 4e8594c283a3e176118ce499b00a9a97cf97eaf6 (diff) | |
| download | portage-2f17d7811b876be5dc718135f6f9bb756683169b.tar.gz portage-2f17d7811b876be5dc718135f6f9bb756683169b.tar.bz2 portage-2f17d7811b876be5dc718135f6f9bb756683169b.zip | |
Fix broken dep_check() call in calc_depclean() to use
depgraph._select_atoms() instead.
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/_emerge/actions.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 606d685ce..f7709f0cd 100644 --- 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(). |