From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QPUG5-00079k-Cf for garchives@archives.gentoo.org; Thu, 26 May 2011 06:41:25 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E9AD51C088; Thu, 26 May 2011 06:41:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B58D21C088 for ; Thu, 26 May 2011 06:41:17 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 534D61B400D for ; Thu, 26 May 2011 06:41:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 777D180505 for ; Thu, 26 May 2011 06:41:16 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: 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: aa8ff193675224cd110c3c489e561e8e8e30eab3 Date: Thu, 26 May 2011 06:41:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 00d3c6774c97f1422551252d567383e5 commit: aa8ff193675224cd110c3c489e561e8e8e30eab3 Author: Zac Medico gentoo org> AuthorDate: Thu May 26 06:40:47 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu May 26 06:40:47 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Daa8ff193 depgraph: always check for autounmask breakage The 2.1.9 branch already does the same thing since commit 65736474c0d70cb10ff1290b3787b61d8a502aed. --- pym/_emerge/depgraph.py | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index d7ddd1a..3dc68ff 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -6673,15 +6673,16 @@ def _backtrack_depgraph(settings, trees, myopts, = myparams, myaction, myfiles, sp allow_backtracking=3DFalse, backtrack_parameters=3Dbacktracker.get_best_run()) success, favorites =3D mydepgraph.select_files(myfiles) - if not success and mydepgraph.autounmask_breakage_detected(): - if "--debug" in myopts: - writemsg_level( - "\n\nautounmask breakage detected\n\n", - noiselevel=3D-1, level=3Dlogging.DEBUG) - myopts["--autounmask"] =3D "n" - mydepgraph =3D depgraph(settings, trees, myopts, myparams, spinner, - frozen_config=3Dfrozen_config, allow_backtracking=3DFalse) - success, favorites =3D mydepgraph.select_files(myfiles) + + if not success and mydepgraph.autounmask_breakage_detected(): + if "--debug" in myopts: + writemsg_level( + "\n\nautounmask breakage detected\n\n", + noiselevel=3D-1, level=3Dlogging.DEBUG) + myopts["--autounmask"] =3D "n" + mydepgraph =3D depgraph(settings, trees, myopts, myparams, spinner, + frozen_config=3Dfrozen_config, allow_backtracking=3DFalse) + success, favorites =3D mydepgraph.select_files(myfiles) =20 return (success, mydepgraph, favorites) =20