summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
Diffstat (limited to 'pym')
-rw-r--r--pym/_emerge/depgraph.py4
-rw-r--r--pym/_emerge/help.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index d05272f4f..074b55869 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -5523,8 +5523,8 @@ def backtrack_depgraph(settings, trees, myopts, myparams,
def _backtrack_depgraph(settings, trees, myopts, myparams, myaction, myfiles, spinner):
- max_retries = myopts.get('--backtrack', 5)
- max_depth = myopts.get('--backtrack', 5)
+ max_retries = myopts.get('--backtrack', 10)
+ max_depth = max(1, (max_retries + 1) / 2)
allow_backtracking = max_retries > 0
backtracker = Backtracker(max_depth)
backtracked = 0
diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py
index 4533cfba0..97562ab3b 100644
--- 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()