1 |
On Tue, 9 May 2017 20:52:35 -0700 |
2 |
Zac Medico <zmedico@g.o> wrote: |
3 |
|
4 |
> Since the default behavior is now for emerge to terminate early for |
5 |
> autounmask changes (unless either --autounmask-backtrack=y or |
6 |
> --autounmask-continue is enabled), it is much less likely that time |
7 |
> will be wasted by fruitless backtracking. Therefore, raise the default |
8 |
> backtrack value from 3 to 10, restoring it to the value it had prior |
9 |
> to commit 1891388ea0ae0dd58903a71a3adc779731523601 (see bug 536926). |
10 |
> This will allow many users to avoid having to manually raise the |
11 |
> --backtrack value. |
12 |
> |
13 |
> X-Gentoo-bug: 540562 |
14 |
> X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=540562 |
15 |
> --- |
16 |
> man/emerge.1 | 2 +- |
17 |
> pym/_emerge/depgraph.py | 2 +- |
18 |
> 2 files changed, 2 insertions(+), 2 deletions(-) |
19 |
> |
20 |
> diff --git a/man/emerge.1 b/man/emerge.1 |
21 |
> index 94edc90..240d4de 100644 |
22 |
> --- a/man/emerge.1 |
23 |
> +++ b/man/emerge.1 |
24 |
> @@ -412,7 +412,7 @@ precedence over existing changes. This option is |
25 |
> automatically enabled with .BR \-\-backtrack=COUNT |
26 |
> Specifies an integer number of times to backtrack if |
27 |
> dependency calculation fails due to a conflict or an |
28 |
> -unsatisfied dependency (default: \'3\'). |
29 |
> +unsatisfied dependency (default: \'10\'). |
30 |
> .TP |
31 |
> .BR "\-\-binpkg\-changed\-deps [ y | n ]" |
32 |
> Tells emerge to ignore binary packages for which the corresponding |
33 |
> diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
34 |
> index 53910dd..cda497b 100644 |
35 |
> --- a/pym/_emerge/depgraph.py |
36 |
> +++ b/pym/_emerge/depgraph.py |
37 |
> @@ -9460,7 +9460,7 @@ def _backtrack_depgraph(settings, trees, |
38 |
> myopts, myparams, myaction, myfiles, sp |
39 |
> debug = "--debug" in myopts |
40 |
> mydepgraph = None |
41 |
> - max_retries = myopts.get('--backtrack', 3) |
42 |
> + max_retries = myopts.get('--backtrack', 10) |
43 |
> max_depth = max(1, (max_retries + 1) // 2) |
44 |
> allow_backtracking = max_retries > 0 |
45 |
> backtracker = Backtracker(max_depth) |
46 |
|
47 |
yeah, is good :) |
48 |
|
49 |
-- |
50 |
Brian Dolbec <dolsen> |