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 1QGe1Q-00040n-Ck for garchives@archives.gentoo.org; Sun, 01 May 2011 21:17:44 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ABE651C09E; Sun, 1 May 2011 21:17:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7B8661C09E for ; Sun, 1 May 2011 21:17:37 +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 0D31B1B403A for ; Sun, 1 May 2011 21:17:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 6B95880505 for ; Sun, 1 May 2011 21:17:36 +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/create_depgraph_params.py pym/_emerge/depgraph.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: a524f21fc85e899455d13301c3d435077c694ece Date: Sun, 1 May 2011 21:17:36 +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: 407c5b4264f49a69f92b6b4ec4a1e6f8 commit: a524f21fc85e899455d13301c3d435077c694ece Author: Zac Medico gentoo org> AuthorDate: Sun May 1 21:17:06 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun May 1 21:17:06 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Da524f21f depgraph: traverse bdeps in complete mode This makes the graph as complete as possible, and can help --rebuild to find more rebuilds. --- pym/_emerge/create_depgraph_params.py | 4 ++++ pym/_emerge/depgraph.py | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/create_depgraph_params.py b/pym/_emerge/create_d= epgraph_params.py index 0986347..ae7a8ae 100644 --- a/pym/_emerge/create_depgraph_params.py +++ b/pym/_emerge/create_depgraph_params.py @@ -17,6 +17,10 @@ def create_depgraph_params(myopts, myaction): # rebuilt_binaries: replace installed packages with rebuilt binaries myparams =3D {"recurse" : True} =20 + bdeps =3D myopts.get("--with-bdeps") + if bdeps is not None: + myparams["bdeps"] =3D bdeps + if myaction =3D=3D "remove": myparams["remove"] =3D True myparams["complete"] =3D True diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index f1c111f..4753bd2 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -1245,7 +1245,7 @@ class depgraph(object): =20 ignore_build_time_deps =3D False if pkg.built and not removal_action: - if self._frozen_config.myopts.get("--with-bdeps", "n") =3D=3D "y": + if self._dynamic_config.myparams.get("bdeps", "n") =3D=3D "y": # Pull in build time deps as requested, but marked them as # "optional" since they are not strictly required. This allows # more freedom in the merge order calculation for solving @@ -1257,7 +1257,7 @@ class depgraph(object): else: ignore_build_time_deps =3D True =20 - if removal_action and self._frozen_config.myopts.get("--with-bdeps", "= y") =3D=3D "n": + if removal_action and self._dynamic_config.myparams.get("bdeps", "y") = =3D=3D "n": ignore_build_time_deps =3D True =20 if removal_action: @@ -3854,6 +3854,9 @@ class depgraph(object): self._select_package =3D self._select_pkg_from_installed else: self._select_package =3D self._select_pkg_from_graph + # Make the graph as complete as possible by traversing build-time + # dependencies if they happen to be installed already. + self._dynamic_config.myparams["bdeps"] =3D "y" already_deep =3D self._dynamic_config.myparams.get("deep") is True if not already_deep: self._dynamic_config.myparams["deep"] =3D True