1 |
On Mon, 2009-04-20 at 02:14 -0700, Zac Medico wrote: |
2 |
> -----BEGIN PGP SIGNED MESSAGE----- |
3 |
> Hash: SHA1 |
4 |
> |
5 |
> Markus Duft wrote: |
6 |
> > Hi! |
7 |
> > |
8 |
> > I have a quick question: is --nodeps supposed to still merge packages in |
9 |
> > the right order? |
10 |
> |
11 |
> Yes. The attached patch should fix it. Thanks for reporting. |
12 |
|
13 |
cool thanks :) so this patch makes portage merge in the order given on |
14 |
the command line? this means it's the users fault if packages are in the |
15 |
wrong order? shouldn't portage do the same thing as with --nodeps, |
16 |
except that it doesn't add new packages to the merge list? don't get me |
17 |
wrong - i'm quite happy with beeing responsible for the order, i just |
18 |
imageined passing (to stay with the same example) "--nodeps texinfo |
19 |
help2man" which should reorder to help2man beeing before texinfo, i |
20 |
would guess... thoughts? |
21 |
|
22 |
Cheers, Markus |
23 |
|
24 |
> |
25 |
> - -- |
26 |
> Thanks, |
27 |
> Zac |
28 |
> -----BEGIN PGP SIGNATURE----- |
29 |
> Version: GnuPG v2.0.11 (GNU/Linux) |
30 |
> |
31 |
> iEYEARECAAYFAknsPNIACgkQ/ejvha5XGaN6EQCfUWVR2U+gCrqv60uMzAssbzm0 |
32 |
> VxUAnjsah7byJwKRO/FVoZWwr0i4kBmE |
33 |
> =X0E7 |
34 |
> -----END PGP SIGNATURE----- |
35 |
> plain text document attachment (nodeps_order.patch) |
36 |
> Index: pym/_emerge/__init__.py |
37 |
> =================================================================== |
38 |
> --- pym/_emerge/__init__.py (revision 13376) |
39 |
> +++ pym/_emerge/__init__.py (revision 13377) |
40 |
> @@ -7039,6 +7039,13 @@ |
41 |
> writemsg("\n", noiselevel=-1) |
42 |
> |
43 |
> scheduler_graph = self.digraph.copy() |
44 |
> + |
45 |
> + if '--nodeps' in self.myopts: |
46 |
> + # Preserve the package order given on the command line. |
47 |
> + return ([node for node in scheduler_graph \ |
48 |
> + if isinstance(node, Package) \ |
49 |
> + and node.operation == 'merge'], scheduler_graph) |
50 |
> + |
51 |
> mygraph=self.digraph.copy() |
52 |
> # Prune "nomerge" root nodes if nothing depends on them, since |
53 |
> # otherwise they slow down merge order calculation. Don't remove |