On Sun, May 14, 2017 at 6:37 AM, Brian Dolbec <dol...@gentoo.org> wrote:
> On Tue, 9 May 2017 20:52:35 -0700 > Zac Medico <zmed...@gentoo.org> wrote: > > > Since the default behavior is now for emerge to terminate early for > > autounmask changes (unless either --autounmask-backtrack=y or > > --autounmask-continue is enabled), it is much less likely that time > > will be wasted by fruitless backtracking. Therefore, raise the default > > backtrack value from 3 to 10, restoring it to the value it had prior > > to commit 1891388ea0ae0dd58903a71a3adc779731523601 (see bug 536926). > > This will allow many users to avoid having to manually raise the > > --backtrack value. > > > > X-Gentoo-bug: 540562 > > X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=540562 > > --- > > man/emerge.1 | 2 +- > > pym/_emerge/depgraph.py | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/man/emerge.1 b/man/emerge.1 > > index 94edc90..240d4de 100644 > > --- a/man/emerge.1 > > +++ b/man/emerge.1 > > @@ -412,7 +412,7 @@ precedence over existing changes. This option is > > automatically enabled with .BR \-\-backtrack=COUNT > > Specifies an integer number of times to backtrack if > > dependency calculation fails due to a conflict or an > > -unsatisfied dependency (default: \'3\'). > > +unsatisfied dependency (default: \'10\'). > > .TP > > .BR "\-\-binpkg\-changed\-deps [ y | n ]" > > Tells emerge to ignore binary packages for which the corresponding > > diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py > > index 53910dd..cda497b 100644 > > --- a/pym/_emerge/depgraph.py > > +++ b/pym/_emerge/depgraph.py > > @@ -9460,7 +9460,7 @@ def _backtrack_depgraph(settings, trees, > > myopts, myparams, myaction, myfiles, sp > > debug = "--debug" in myopts > > mydepgraph = None > > - max_retries = myopts.get('--backtrack', 3) > > + max_retries = myopts.get('--backtrack', 10) > > max_depth = max(1, (max_retries + 1) // 2) > > allow_backtracking = max_retries > 0 > > backtracker = Backtracker(max_depth) > > yeah, is good :) > Thanks, merged: https://gitweb.gentoo.org/proj/portage.git/commit/?id=cbf9f3c0167a68de7901b2a0992c2d0a264b9b22 -- Thanks, Zac
