diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-07-09 01:46:24 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-07-09 01:46:24 +0000 |
| commit | ade72eb9c45b38c3d1bf8e68de88854563eea033 (patch) | |
| tree | ea827593c34ac4d264b0419086878459365f2173 | |
| parent | 75b5780fc77b82db648cb72ac1074088d4e2f48e (diff) | |
| download | portage-ade72eb9c45b38c3d1bf8e68de88854563eea033.tar.gz portage-ade72eb9c45b38c3d1bf8e68de88854563eea033.tar.bz2 portage-ade72eb9c45b38c3d1bf8e68de88854563eea033.zip | |
Fix _prune_digraph() to correctly distinguish "nomerge" nodes from
"uninstall" nodes.
svn path=/main/trunk/; revision=10995
| -rw-r--r-- | pym/_emerge/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 8ef659ab5..cd43593de 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -7723,7 +7723,8 @@ class Scheduler(object): while True: for node in graph.root_nodes(): if not isinstance(node, Package) or \ - node.installed or node.onlydeps or \ + (node.installed and node.operation == "nomerge") or \ + node.onlydeps or \ node in completed_tasks: removed_nodes.add(node) if removed_nodes: |