summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-04-20 09:11:35 +0000
committerZac Medico <zmedico@gentoo.org>2009-04-20 09:11:35 +0000
commit2149ed892bfecb2172db7f3ce84bb791fdb68fa8 (patch)
treeb52aebc72f2e609ff7f15d742a2b8f31a259128d
parent69164ee6810d146676bb51c26e9c9d8f89996035 (diff)
downloadportage-2149ed892bfecb2172db7f3ce84bb791fdb68fa8.tar.gz
portage-2149ed892bfecb2172db7f3ce84bb791fdb68fa8.tar.bz2
portage-2149ed892bfecb2172db7f3ce84bb791fdb68fa8.zip
When in --nodeps mode, make depgraph._serialize_tasks() preserve the package
order given on the command line. Thanks to Markus Duft <mduft@g.o> for reporting. svn path=/main/trunk/; revision=13377
-rw-r--r--pym/_emerge/__init__.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 78f58b526..e031ede22 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -7039,6 +7039,13 @@ class depgraph(object):
writemsg("\n", noiselevel=-1)
scheduler_graph = self.digraph.copy()
+
+ if '--nodeps' in self.myopts:
+ # Preserve the package order given on the command line.
+ return ([node for node in scheduler_graph \
+ if isinstance(node, Package) \
+ and node.operation == 'merge'], scheduler_graph)
+
mygraph=self.digraph.copy()
# Prune "nomerge" root nodes if nothing depends on them, since
# otherwise they slow down merge order calculation. Don't remove