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 1QQ6Hk-00051Q-0Y for garchives@archives.gentoo.org; Fri, 27 May 2011 23:17:42 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C11B1C059; Fri, 27 May 2011 23:17:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6BF621C059 for ; Fri, 27 May 2011 23:17:32 +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 027CC1B4016 for ; Fri, 27 May 2011 23:17:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 5DEE580505 for ; Fri, 27 May 2011 23:17:31 +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: <445f1ae80fa64950f1058a62fd4aab1becc80709.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: 445f1ae80fa64950f1058a62fd4aab1becc80709 Date: Fri, 27 May 2011 23:17:31 +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: a59d457c43c26bf5cd6b3c5b4477068a commit: 445f1ae80fa64950f1058a62fd4aab1becc80709 Author: Zac Medico gentoo org> AuthorDate: Fri May 27 23:17:09 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri May 27 23:17:09 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D445f1ae8 backtrack_depgraph: display_problems for each run --- pym/_emerge/depgraph.py | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 8ad0547..de75eb1 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -6631,6 +6631,8 @@ def backtrack_depgraph(settings, trees, myopts, myp= arams, =20 def _backtrack_depgraph(settings, trees, myopts, myparams, myaction, myf= iles, spinner): =20 + debug =3D "--debug" in myopts + mydepgraph =3D None max_retries =3D myopts.get('--backtrack', 10) max_depth =3D max(1, (max_retries + 1) / 2) allow_backtracking =3D max_retries > 0 @@ -6641,6 +6643,13 @@ def _backtrack_depgraph(settings, trees, myopts, m= yparams, myaction, myfiles, sp myopts, spinner) =20 while backtracker: + + if debug and mydepgraph is not None: + writemsg_level( + "\n\nbacktracking try %s \n\n" % \ + backtracked, noiselevel=3D-1, level=3Dlogging.DEBUG) + mydepgraph.display_problems() + backtrack_parameters =3D backtracker.get() =20 mydepgraph =3D depgraph(settings, trees, myopts, myparams, spinner, @@ -6663,10 +6672,11 @@ def _backtrack_depgraph(settings, trees, myopts, = myparams, myaction, myfiles, sp =20 if not (success or mydepgraph.success_without_autounmask()) and backtra= cked: =20 - if "--debug" in myopts: + if debug: writemsg_level( "\n\nbacktracking aborted after %s tries\n\n" % \ backtracked, noiselevel=3D-1, level=3Dlogging.DEBUG) + mydepgraph.display_problems() =20 mydepgraph =3D depgraph(settings, trees, myopts, myparams, spinner, frozen_config=3Dfrozen_config, @@ -6675,10 +6685,11 @@ def _backtrack_depgraph(settings, trees, myopts, = myparams, myaction, myfiles, sp success, favorites =3D mydepgraph.select_files(myfiles) =20 if not success and mydepgraph.autounmask_breakage_detected(): - if "--debug" in myopts: + if debug: writemsg_level( "\n\nautounmask breakage detected\n\n", noiselevel=3D-1, level=3Dlogging.DEBUG) + mydepgraph.display_problems() myopts["--autounmask"] =3D "n" mydepgraph =3D depgraph(settings, trees, myopts, myparams, spinner, frozen_config=3Dfrozen_config, allow_backtracking=3DFalse)