| 1 |
Author: zmedico |
| 2 |
Date: 2009-04-30 07:21:45 +0000 (Thu, 30 Apr 2009) |
| 3 |
New Revision: 13529 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.6/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. (trunk r13377) |
| 11 |
|
| 12 |
Modified: main/branches/2.1.6/pym/_emerge/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.6/pym/_emerge/__init__.py 2009-04-30 07:21:28 UTC (rev 13528) |
| 15 |
+++ main/branches/2.1.6/pym/_emerge/__init__.py 2009-04-30 07:21:45 UTC (rev 13529) |
| 16 |
@@ -7023,6 +7023,13 @@ |
| 17 |
writemsg("\n", noiselevel=-1) |
| 18 |
|
| 19 |
scheduler_graph = self.digraph.copy() |
| 20 |
+ |
| 21 |
+ if '--nodeps' in self.myopts: |
| 22 |
+ # Preserve the package order given on the command line. |
| 23 |
+ return ([node for node in scheduler_graph \ |
| 24 |
+ if isinstance(node, Package) \ |
| 25 |
+ and node.operation == 'merge'], scheduler_graph) |
| 26 |
+ |
| 27 |
mygraph=self.digraph.copy() |
| 28 |
# Prune "nomerge" root nodes if nothing depends on them, since |
| 29 |
# otherwise they slow down merge order calculation. Don't remove |
Archives