From 2149ed892bfecb2172db7f3ce84bb791fdb68fa8 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 20 Apr 2009 09:11:35 +0000 Subject: When in --nodeps mode, make depgraph._serialize_tasks() preserve the package order given on the command line. Thanks to Markus Duft for reporting. svn path=/main/trunk/; revision=13377 --- pym/_emerge/__init__.py | 7 +++++++ 1 file changed, 7 insertions(+) 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 -- cgit v1.2.3-1-g7c22