[gentoo-commits] proj/portage:master commit in: man/, lib/_emerge/, /

[gentoo-commits] proj/portage:master commit in: man/, lib/_emerge/, /

[Sam James]

commit:     fb8d44f02032a0c5ef64a84ac898c08104faf797
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 10 06:52:29 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 12 05:00:47 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=fb8d44f0

emerge: Increase default number of maximum backtrack attempts from 10 to 20

Experience shows that 10 is too low and that in some cases a slighlty
higher number results in a successful dependency calculation.

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
Closes: https://github.com/gentoo/portage/pull/1127
Signed-off-by: Sam James <sam <AT> gentoo.org>

 NEWS                    | 2 ++
 lib/_emerge/depgraph.py | 2 +-
 man/emerge.1            | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index e437f481f6..9f93bfbf08 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@ Features:
 * GNUMAKEFLAGS: also specify "-l $(nproc)", that is, limit by load average,
   per default.
 
+* Increase default number of maximum backtrack attempts from 10 to 20.
+
 Bug fixes:
 * bintree: Add another API member (invalid_errors) to allow eclean-pkg to suppress
   errors when cleaning invalid binpkgs (bug #900224).

diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py
index a0d69ff305..ad835ac06a 100644
--- a/lib/_emerge/depgraph.py
+++ b/lib/_emerge/depgraph.py
@@ -11459,7 +11459,7 @@ def _backtrack_depgraph(
 ) -> tuple[Any, depgraph, list[str], int, int]:
     debug = "--debug" in myopts
     mydepgraph = None
-    max_retries = myopts.get("--backtrack", 10)
+    max_retries = myopts.get("--backtrack", 20)
     max_depth = max(1, (max_retries + 1) // 2)
     allow_backtracking = max_retries > 0
     backtracker = Backtracker(max_depth)

diff --git a/man/emerge.1 b/man/emerge.1
index ed3cf929fe..667138ff3a 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -440,7 +440,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: \'10\').
+unsatisfied dependency (default: \'20\').
 .TP
 .BR "\-\-binpkg\-changed\-deps [ y | n ]"
 Tells emerge to ignore binary packages for which the corresponding