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 1QKEiV-00019d-IA for garchives@archives.gentoo.org; Wed, 11 May 2011 19:05:05 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B0A631C054; Wed, 11 May 2011 19:04:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6B9B11C054 for ; Wed, 11 May 2011 19:04:55 +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 B08CF1B4036 for ; Wed, 11 May 2011 19:04:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 2765E80504 for ; Wed, 11 May 2011 19:04:54 +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: man/, pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: man/emerge.1 pym/_emerge/depgraph.py pym/_emerge/help.py X-VCS-Directories: man/ pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: e6cb6af7cf6a443b892f32f1408a98c6bd4d3c10 Date: Wed, 11 May 2011 19:04:54 +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: 20bcc35bd195312990438e5de219963c commit: e6cb6af7cf6a443b892f32f1408a98c6bd4d3c10 Author: Zac Medico gentoo org> AuthorDate: Wed May 11 19:00:27 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed May 11 19:00:27 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3De6cb6af7 depgraph: in complete mode respect --with-bdeps If you want the graph as complete as possible, now you'll have to use --with-bdeps=3Dy together with --complete-graph. --- man/emerge.1 | 2 ++ pym/_emerge/depgraph.py | 10 +++------- pym/_emerge/help.py | 5 ++++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/man/emerge.1 b/man/emerge.1 index 907bb4f..d4cf42d 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -351,6 +351,8 @@ option will significantly increase the time taken for= dependency calculations. Note that, unlike the \fB\-\-deep\fR option, the \fB\-\-complete\-graph\fR option does not cause any more packages to be updated than would have otherwise been updated with the option disabl= ed. +Using \fB\-\-with\-bdeps=3Dy\fR together with \fB\-\-complete\-graph\fR = makes +the graph as complete as possible. .TP .BR \-\-config\-root=3DDIR Set the \fBPORTAGE_CONFIGROOT\fR environment variable. diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index b8089ae..3169d19 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -1343,11 +1343,10 @@ class depgraph(object): ignore_build_time_deps =3D True =20 # If rebuild mode is not enabled, it's safe to discard ignored - # build-time dependencies. However, keep them if "complete" mode - # is enabled, since they make the graph more complete. + # build-time dependencies. If you want these deps to be traversed + # in "complete" mode then you need to specify --with-bdeps=3Dy. if ignore_build_time_deps and \ - not self._rebuild.rebuild and \ - "complete" not in self._dynamic_config.myparams: + not self._rebuild.rebuild: edepend["DEPEND"] =3D "" =20 deps =3D ( @@ -4000,9 +3999,6 @@ 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" self._dynamic_config._traverse_ignored_deps =3D True already_deep =3D self._dynamic_config.myparams.get("deep") is True if not already_deep: diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py index de50b75..9de6aad 100644 --- a/pym/_emerge/help.py +++ b/pym/_emerge/help.py @@ -383,7 +383,10 @@ def help(myopts, havecolor=3D1): " option will significantly increase the time taken for dependency" += \ " calculations. Note that, unlike the --deep option, the" + \ " --complete-graph option does not cause any more packages to" + \ - " be updated than would have otherwise been updated with the option d= isabled." + " be updated than would have otherwise " + \ + "been updated with the option disabled. " + \ + "Using --with-bdeps=3Dy together with --complete-graph makes " + \ + "the graph as complete as possible." for line in wrap(desc, desc_width): print(desc_indent + line) print()