From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id DB6931381F3 for ; Sun, 4 Aug 2013 20:21:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8B184E0B08; Sun, 4 Aug 2013 20:21:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 220DFE0B08 for ; Sun, 4 Aug 2013 20:21:41 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3890C33EA6A for ; Sun, 4 Aug 2013 20:21:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B7CF1E468F for ; Sun, 4 Aug 2013 20:21:38 +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: <1375647679.c6679936d162f35a330ce541ec4cd0567ccf76d8.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/depgraph.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: c6679936d162f35a330ce541ec4cd0567ccf76d8 X-VCS-Branch: master Date: Sun, 4 Aug 2013 20:21:38 +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: a36843c5-5c15-43a0-a93c-a39d73ef7f50 X-Archives-Hash: 1f26b6da792f69a858773149a5052688 commit: c6679936d162f35a330ce541ec4cd0567ccf76d8 Author: Zac Medico gentoo org> AuthorDate: Sun Aug 4 20:21:19 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Aug 4 20:21:19 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=c6679936 depgraph: trigger reinstalls if backtrack allowed This should fix cases where it tries to backtrack but simply aborts with --backtrack=0. --- pym/_emerge/depgraph.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 4f9d0f0..7b77edc 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -5863,7 +5863,8 @@ class depgraph(object): self._process_slot_conflicts() - self._slot_operator_trigger_reinstalls() + if self._dynamic_config._allow_backtracking: + self._slot_operator_trigger_reinstalls() if not self._validate_blockers(): # Blockers don't trigger the _skip_restart flag, since