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-316480-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1PorLJ-0002Xb-5E
for garchives@archives.gentoo.org; Mon, 14 Feb 2011 05:51:25 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 69D0CE08E9;
Mon, 14 Feb 2011 05:51:17 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 3CB49E08E9
for <gentoo-commits@lists.gentoo.org>; Mon, 14 Feb 2011 05:51:17 +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 A078C1B40B4
for <gentoo-commits@lists.gentoo.org>; Mon, 14 Feb 2011 05:51:16 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 16DA98006A
for <gentoo-commits@lists.gentoo.org>; Mon, 14 Feb 2011 05:51:16 +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: <729b9c2bb068a41c38f93a553794b478a6e2e705.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: 729b9c2bb068a41c38f93a553794b478a6e2e705
Date: Mon, 14 Feb 2011 05:51:16 +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: 9e6b18e94bcbe56bf7f3959640220860
commit: 729b9c2bb068a41c38f93a553794b478a6e2e705
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 14 05:50:29 2011 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Feb 14 05:50:29 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3D729b9c2b
depgraph: --nodeps overrides --deep
---
pym/_emerge/create_depgraph_params.py | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/pym/_emerge/create_depgraph_params.py b/pym/_emerge/create_d=
epgraph_params.py
index 454363e..b0b49b3 100644
--- a/pym/_emerge/create_depgraph_params.py
+++ b/pym/_emerge/create_depgraph_params.py
@@ -29,8 +29,7 @@ def create_depgraph_params(myopts, myaction):
"--noreplace" in myopts or \
myopts.get("--selective", "n") !=3D "n":
myparams["selective"] =3D True
- if "--nodeps" in myopts:
- myparams.pop("recurse", None)
+
if "--deep" in myopts:
myparams["deep"] =3D myopts["--deep"]
if "--complete-graph" in myopts:
@@ -40,6 +39,10 @@ def create_depgraph_params(myopts, myaction):
myparams["deep"] =3D True
myparams.pop("selective", None)
=20
+ if "--nodeps" in myopts:
+ myparams.pop("recurse", None)
+ myparams.pop("deep", None)
+
rebuilt_binaries =3D myopts.get('--rebuilt-binaries')
if rebuilt_binaries is True or \
rebuilt_binaries !=3D 'n' and \