diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-04-30 07:21:45 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-04-30 07:21:45 +0000 |
| commit | 9995bbd6f3316bab82e66c36522c381ab27792ab (patch) | |
| tree | 5c8292c8c854a611ca42fb6b0dc2d8dc5f515e33 /pym | |
| parent | Add note about 'use' in the Atom.intersects() docstring. (trunk r13375) (diff) | |
| download | portage-multirepo-9995bbd6f3316bab82e66c36522c381ab27792ab.tar.gz portage-multirepo-9995bbd6f3316bab82e66c36522c381ab27792ab.tar.bz2 portage-multirepo-9995bbd6f3316bab82e66c36522c381ab27792ab.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. (trunk r13377)
svn path=/main/branches/2.1.6/; revision=13529
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/_emerge/__init__.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 879579bb..7023c338 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -7023,6 +7023,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 |