diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-02 19:22:09 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-02 19:22:09 +0000 |
| commit | e83abd7ac0332ca1ad7c1451e98a90c77aa57ccb (patch) | |
| tree | 6b208429132e08ce86a9c434a01626f29d6966ed /bin | |
| parent | 048b48cf4a583d507d46d1d5e833f54fb966580e (diff) | |
| download | portage-e83abd7ac0332ca1ad7c1451e98a90c77aa57ccb.tar.gz portage-e83abd7ac0332ca1ad7c1451e98a90c77aa57ccb.tar.bz2 portage-e83abd7ac0332ca1ad7c1451e98a90c77aa57ccb.zip | |
In depgraph._serialize_tasks(), filter "nomerge" nodes at a more appropriate
place. (trunk r10098)
svn path=/main/branches/2.1.2/; revision=10099
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge index af42ebfa5..9e3226548 100755 --- a/bin/emerge +++ b/bin/emerge @@ -3940,6 +3940,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. @@ -3973,8 +3976,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: |