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 1PoY1L-000195-NT for garchives@archives.gentoo.org; Sun, 13 Feb 2011 09:13:33 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 36291E0656; Sun, 13 Feb 2011 09:13:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 08F75E0656 for ; Sun, 13 Feb 2011 09:13:23 +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 975CB1B4091 for ; Sun, 13 Feb 2011 09:13:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id BE6F88006A for ; Sun, 13 Feb 2011 09:13:22 +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: <878f166c5a06b0ab6c5a34dd658c878cc7605fe7.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/create_depgraph_params.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 878f166c5a06b0ab6c5a34dd658c878cc7605fe7 Date: Sun, 13 Feb 2011 09:13:22 +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: aaf961a24e85e1ddb1448064ebc63b85 commit: 878f166c5a06b0ab6c5a34dd658c878cc7605fe7 Author: Zac Medico gentoo org> AuthorDate: Sun Feb 13 09:06:39 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Feb 13 09:06:39 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D878f166c depgraph: make empty param imply deep =3D True This won't change the existing depgraph behavior, but it will allow logic to be simplified in some cases such that solely the deep param needs to be consulted (rather than needing to consult both empty and deep params). --- pym/_emerge/create_depgraph_params.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pym/_emerge/create_depgraph_params.py b/pym/_emerge/create_d= epgraph_params.py index 375332e..454363e 100644 --- a/pym/_emerge/create_depgraph_params.py +++ b/pym/_emerge/create_depgraph_params.py @@ -29,15 +29,16 @@ def create_depgraph_params(myopts, myaction): "--noreplace" in myopts or \ myopts.get("--selective", "n") !=3D "n": myparams["selective"] =3D True - if "--emptytree" in myopts: - myparams["empty"] =3D True - myparams.pop("selective", None) if "--nodeps" in myopts: myparams.pop("recurse", None) if "--deep" in myopts: myparams["deep"] =3D myopts["--deep"] if "--complete-graph" in myopts: myparams["complete"] =3D True + if "--emptytree" in myopts: + myparams["empty"] =3D True + myparams["deep"] =3D True + myparams.pop("selective", None) =20 rebuilt_binaries =3D myopts.get('--rebuilt-binaries') if rebuilt_binaries is True or \