Raise default backtrack limit from 5 to 10.

diff --git a/man/emerge.1 b/man/emerge.1
index 220ef3d80d5676591208819940616b30429ae80f..61547f81d8c8f8a6de31a59db73af3fb7c75fb63 100644 (file)
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -297,7 +297,7 @@ LICENSE masks, and package.use settings.
 .BR \-\-backtrack=COUNT
 Specifies an integer number of times to backtrack if
 dependency calculation fails due to a conflict or an
-unsatisfied dependency (default: \'5\').
+unsatisfied dependency (default: \'10\').
 .TP
 .BR "\-\-binpkg\-respect\-use < y | n >"
 Tells emerge to ignore binary packages if their use flags

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 51ddeb53d2e93dbe50c9beaf3ce61f491c37ae14..35512fc169853972f711124d838c2d98cc4ec486 100644 (file)
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -5466,7 +5466,7 @@ def backtrack_depgraph(settings, trees, myopts, myparams,
 def _backtrack_depgraph(settings, trees, myopts, myparams, 
        myaction, myfiles, spinner):
 
-       backtrack_max = myopts.get('--backtrack', 5)
+       backtrack_max = myopts.get('--backtrack', 10)
        backtrack_parameters = {}
        needed_unstable_keywords = None
        allow_backtracking = backtrack_max > 0

diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py
index 4533cfba0c7dd4bbf50b3bdf8265224df7c90444..97562ab3bc8a495d729007ffafa3d2db457c9943 100644 (file)
--- a/pym/_emerge/help.py
+++ b/pym/_emerge/help.py
@@ -314,7 +314,7 @@ def help(myopts, havecolor=1):
                print("       " + green("--backtrack") + " " + turquoise("COUNT"))
                desc = "Specifies an integer number of times to backtrack if " + \
                        "dependency calculation fails due to a conflict or an " + \
-                       "unsatisfied dependency (default: '5')."
+                       "unsatisfied dependency (default: '10')."
                for line in wrap(desc, desc_width):
                        print(desc_indent + line)
                print()