diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2017-05-09 20:45:10 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2017-05-14 11:11:51 -0700 |
| commit | cbf9f3c0167a68de7901b2a0992c2d0a264b9b22 (patch) | |
| tree | 04d5283997e59583ca20410282251c7284a8fa6b | |
| parent | emerge: terminate backtracking early for autounmask changes (bug 615680) (diff) | |
| download | portage-cbf9f3c0.tar.gz portage-cbf9f3c0.tar.bz2 portage-cbf9f3c0.zip | |
emerge: default --backtrack=10 (bug 540562)
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
Acked-by: Brian Dolbec <dolsen@gentoo.org>
| -rw-r--r-- | man/emerge.1 | 2 | ||||
| -rw-r--r-- | pym/_emerge/depgraph.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/man/emerge.1 b/man/emerge.1 index 94edc9095..240d4de7e 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 53910dd25..cda497b1d 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) |