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 <gentoo-commits+bounces-316550-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1PotBZ-0006Ku-Se
for garchives@archives.gentoo.org; Mon, 14 Feb 2011 07:49:33 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id BB3D6E09B5;
Mon, 14 Feb 2011 07:49:12 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 7A90FE09B5
for <gentoo-commits@lists.gentoo.org>; Mon, 14 Feb 2011 07:49:12 +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 1EFC21B4106
for <gentoo-commits@lists.gentoo.org>; Mon, 14 Feb 2011 07:49:12 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 772C18006E
for <gentoo-commits@lists.gentoo.org>; Mon, 14 Feb 2011 07:49:11 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <5c72bae0306384a0f4e6f3fb67b5d59dba0f6b46.zmedico@gentoo>
Subject: [gentoo-commits] proj/portage:2.1.9 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: 5c72bae0306384a0f4e6f3fb67b5d59dba0f6b46
Date: Mon, 14 Feb 2011 07:49:11 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: 45e62902fe9d5dc2736d44e8c5bc4279
commit: 5c72bae0306384a0f4e6f3fb67b5d59dba0f6b46
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 14 06:05:52 2011 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Feb 14 07:48:17 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3D5c72bae0
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 160299b..23f45e2 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -675,9 +675,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 \
@@ -1056,8 +1055,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
@@ -1116,8 +1114,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
@@ -3615,7 +3612,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 \