| 1 |
Author: zmedico |
| 2 |
Date: 2009-04-20 09:11:35 +0000 (Mon, 20 Apr 2009) |
| 3 |
New Revision: 13377 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
When in --nodeps mode, make depgraph._serialize_tasks() preserve the package |
| 9 |
order given on the command line. Thanks to Markus Duft <mduft@g.o> for |
| 10 |
reporting. |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 14 |
=================================================================== |
| 15 |
--- main/trunk/pym/_emerge/__init__.py 2009-04-19 23:29:53 UTC (rev 13376) |
| 16 |
+++ main/trunk/pym/_emerge/__init__.py 2009-04-20 09:11:35 UTC (rev 13377) |
| 17 |
@@ -7039,6 +7039,13 @@ |
| 18 |
writemsg("\n", noiselevel=-1) |
| 19 |
|
| 20 |
scheduler_graph = self.digraph.copy() |
| 21 |
+ |
| 22 |
+ if '--nodeps' in self.myopts: |
| 23 |
+ # Preserve the package order given on the command line. |
| 24 |
+ return ([node for node in scheduler_graph \ |
| 25 |
+ if isinstance(node, Package) \ |
| 26 |
+ and node.operation == 'merge'], scheduler_graph) |
| 27 |
+ |
| 28 |
mygraph=self.digraph.copy() |
| 29 |
# Prune "nomerge" root nodes if nothing depends on them, since |
| 30 |
# otherwise they slow down merge order calculation. Don't remove |
Archives