Gentoo Archives: gentoo-commits

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