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 1PorbN-0005sp-5d for garchives@archives.gentoo.org; Mon, 14 Feb 2011 06:08:01 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 87FF0E0960; Mon, 14 Feb 2011 06:06:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 478D7E0967 for ; Mon, 14 Feb 2011 06:06:24 +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 AE7D31B40B4 for ; Mon, 14 Feb 2011 06:06:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 1E2428006A for ; Mon, 14 Feb 2011 06:06:23 +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: e348dbd08e4aae2346566688d9a6b2c5637b4ebd Date: Mon, 14 Feb 2011 06:06:23 +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: 97d6233836dc38d996d97d38b4438b83 commit: e348dbd08e4aae2346566688d9a6b2c5637b4ebd Author: Zac Medico gentoo org> AuthorDate: Mon Feb 14 06:05:52 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Feb 14 06:05:52 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3De348dbd0 depgraph: remove redundant "empty" param checks Since commit 878f166c5a06b0ab6c5a34dd658c878cc7605fe7, empty implies deep =3D True, so these checks are redundant. --- pym/_emerge/depgraph.py | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index d6c74e4..8a616dc 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -655,9 +655,8 @@ class depgraph(object): debug =3D "--debug" in self._frozen_config.myopts buildpkgonly =3D "--buildpkgonly" in self._frozen_config.myopts nodeps =3D "--nodeps" in self._frozen_config.myopts - empty =3D "empty" in self._dynamic_config.myparams deep =3D self._dynamic_config.myparams.get("deep", 0) - recurse =3D empty or deep is True or dep.depth <=3D deep + recurse =3D deep is True or dep.depth <=3D deep if dep.blocker: if not buildpkgonly and \ not nodeps and \ @@ -1037,8 +1036,7 @@ class depgraph(object): depth =3D 0 pkg.depth =3D depth deep =3D self._dynamic_config.myparams.get("deep", 0) - empty =3D "empty" in self._dynamic_config.myparams - recurse =3D empty or deep is True or depth + 1 <=3D deep + recurse =3D deep is True or depth + 1 <=3D deep dep_stack =3D self._dynamic_config._dep_stack if "recurse" not in self._dynamic_config.myparams: return 1 @@ -1097,8 +1095,7 @@ class depgraph(object): =20 if not pkg.built and \ "--buildpkgonly" in self._frozen_config.myopts and \ - "deep" not in self._dynamic_config.myparams and \ - "empty" not in self._dynamic_config.myparams: + "deep" not in self._dynamic_config.myparams: edepend["RDEPEND"] =3D "" edepend["PDEPEND"] =3D "" =20 @@ -3663,7 +3660,7 @@ class depgraph(object): depgraph_sets.sets.update(required_sets[root]) if "remove" not in self._dynamic_config.myparams and \ root =3D=3D self._frozen_config.target_root and \ - (already_deep or "empty" in self._dynamic_config.myparams): + already_deep: remaining_args.difference_update(depgraph_sets.sets) if not remaining_args and \ not self._dynamic_config._ignored_deps and \