summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-10-22 13:48:24 -0700
committerZac Medico <zmedico@gentoo.org>2010-10-22 13:48:24 -0700
commit0c8d771059522389cbabac6279e7eb6775ffd80e (patch)
treeccb4a5bb1c6ff3f8ddbd766ff6739e6405f83bd1
parentb66262b057a5c4574f372bd281982c0e316ecb85 (diff)
downloadportage-0c8d771059522389cbabac6279e7eb6775ffd80e.tar.gz
portage-0c8d771059522389cbabac6279e7eb6775ffd80e.tar.bz2
portage-0c8d771059522389cbabac6279e7eb6775ffd80e.zip
Raise default backtrack limit from 5 to 10.
-rw-r--r--man/emerge.12
-rw-r--r--pym/_emerge/depgraph.py2
-rw-r--r--pym/_emerge/help.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/man/emerge.1 b/man/emerge.1
index 220ef3d80..61547f81d 100644
--- 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 51ddeb53d..35512fc16 100644
--- 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 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()