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-475851-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1SgLSS-0002oR-JS
for garchives@archives.gentoo.org; Sun, 17 Jun 2012 19:48:24 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B513EE0667;
Sun, 17 Jun 2012 19:48:17 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 8AD72E0662
for <gentoo-commits@lists.gentoo.org>; Sun, 17 Jun 2012 19:48:17 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id F019F1B403E
for <gentoo-commits@lists.gentoo.org>; Sun, 17 Jun 2012 19:48:16 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id B1A0BE5430
for <gentoo-commits@lists.gentoo.org>; Sun, 17 Jun 2012 19:48:15 +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: <1339962468.49ee1ca5ea9868f2f4feefcc9e72edb0dffff4c8.zmedico@gentoo>
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: 49ee1ca5ea9868f2f4feefcc9e72edb0dffff4c8
X-VCS-Branch: master
Date: Sun, 17 Jun 2012 19:48:15 +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: 7c5fb048-3ee5-4972-8622-b7fc5bddb9a3
X-Archives-Hash: 07a7b5312a8300ef6f260b01d7110dda
commit: 49ee1ca5ea9868f2f4feefcc9e72edb0dffff4c8
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 17 19:44:56 2012 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Jun 17 19:47:48 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3D49ee1ca5
depgraph._add_pkg: preserve previous pkg depth
---
pym/_emerge/depgraph.py | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 8aa53aa..9aa9d04 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -1345,6 +1345,8 @@ class depgraph(object):
# If we are in --nodeps (no recursion) mode, we obviously only check 1=
level of dependencies.
if arg_atoms:
depth =3D 0
+ if previously_added and pkg.depth is not None:
+ depth =3D min(pkg.depth, depth)
pkg.depth =3D depth
deep =3D self._dynamic_config.myparams.get("deep", 0)
recurse =3D deep is True or depth + 1 <=3D deep