diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-02 19:20:29 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-02 19:20:29 +0000 |
| commit | 2e79f785a5ae93d042275508f3e1ac8078e24842 (patch) | |
| tree | e09236befd5e8b2c5a85f4212b0ade3549d839f9 /pym/_emerge | |
| parent | 50c060641f4a84020d0a37d88c3393c2dc4aa005 (diff) | |
| download | portage-2e79f785a5ae93d042275508f3e1ac8078e24842.tar.gz portage-2e79f785a5ae93d042275508f3e1ac8078e24842.tar.bz2 portage-2e79f785a5ae93d042275508f3e1ac8078e24842.zip | |
In depgraph._serialize_tasks(), filter "nomerge" nodes at a more appropriate
place.
svn path=/main/trunk/; revision=10098
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/__init__.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 506255087..a988c6bac 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -3793,6 +3793,9 @@ class depgraph(object): mygraph.difference_update(selected_nodes) for node in selected_nodes: + if isinstance(node, Package) and \ + node.operation == "nomerge": + continue # Handle interactions between blockers # and uninstallation tasks. @@ -3826,8 +3829,7 @@ class depgraph(object): myblocker_uninstalls.remove(blocker) solved_blockers.add(blocker) - if node[-1] != "nomerge": - retlist.append(node) + retlist.append(node) if isinstance(node, Package) and \ "uninstall" == node.operation: |