| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-02 19:22:09 +0000 (Fri, 02 May 2008) |
| 3 |
New Revision: 10099 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
In depgraph._serialize_tasks(), filter "nomerge" nodes at a more appropriate |
| 9 |
place. (trunk r10098) |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/branches/2.1.2/bin/emerge |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.2/bin/emerge 2008-05-02 19:20:29 UTC (rev 10098) |
| 15 |
+++ main/branches/2.1.2/bin/emerge 2008-05-02 19:22:09 UTC (rev 10099) |
| 16 |
@@ -3940,6 +3940,9 @@ |
| 17 |
mygraph.difference_update(selected_nodes) |
| 18 |
|
| 19 |
for node in selected_nodes: |
| 20 |
+ if isinstance(node, Package) and \ |
| 21 |
+ node.operation == "nomerge": |
| 22 |
+ continue |
| 23 |
|
| 24 |
# Handle interactions between blockers |
| 25 |
# and uninstallation tasks. |
| 26 |
@@ -3973,8 +3976,7 @@ |
| 27 |
myblocker_uninstalls.remove(blocker) |
| 28 |
solved_blockers.add(blocker) |
| 29 |
|
| 30 |
- if node[-1] != "nomerge": |
| 31 |
- retlist.append(node) |
| 32 |
+ retlist.append(node) |
| 33 |
|
| 34 |
if isinstance(node, Package) and \ |
| 35 |
"uninstall" == node.operation: |
| 36 |
|
| 37 |
-- |
| 38 |
gentoo-commits@l.g.o mailing list |
Archives