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