From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A81CB139694 for ; Sun, 14 May 2017 18:12:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1622EE0E1D; Sun, 14 May 2017 18:12:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E67F5E0E1D for ; Sun, 14 May 2017 18:12:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2F3C1341656 for ; Sun, 14 May 2017 18:12:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CBAF87454 for ; Sun, 14 May 2017 18:12:27 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1494785511.cbf9f3c0167a68de7901b2a0992c2d0a264b9b22.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: man/, pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: man/emerge.1 pym/_emerge/depgraph.py X-VCS-Directories: man/ pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: cbf9f3c0167a68de7901b2a0992c2d0a264b9b22 X-VCS-Branch: master Date: Sun, 14 May 2017 18:12:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 87936e46-b426-423a-b361-91ca15d74afe X-Archives-Hash: b21bdbf67dad45c28bfe424be28a8b1a commit: cbf9f3c0167a68de7901b2a0992c2d0a264b9b22 Author: Zac Medico gentoo org> AuthorDate: Wed May 10 03:45:10 2017 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun May 14 18:11:51 2017 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=cbf9f3c0 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 gentoo.org> man/emerge.1 | 2 +- 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)