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 1QHfo9-0004RO-HW for garchives@archives.gentoo.org; Wed, 04 May 2011 17:24:17 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 96E031C02E; Wed, 4 May 2011 17:24:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 683001C02E for ; Wed, 4 May 2011 17:24:10 +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 DD2CE1B4066 for ; Wed, 4 May 2011 17:24:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 0391380505 for ; Wed, 4 May 2011 17:24:09 +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: af430c8b439cf67079b54fa3b18312e0a6afce8d Date: Wed, 4 May 2011 17:24:09 +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: 7916736a472ba5b5a2307b910f6e79ee commit: af430c8b439cf67079b54fa3b18312e0a6afce8d Author: Zac Medico gentoo org> AuthorDate: Wed May 4 17:20:58 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed May 4 17:20:58 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Daf430c8b add_pkg_dep_string: respect traverse_ignored_deps I don't think this makes any difference now, but it clarifies how traverse_ignored_deps should behave. --- pym/_emerge/depgraph.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index ebfbdd4..9dcc5b9 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -1543,7 +1543,8 @@ class depgraph(object): self._dynamic_config._ignored_deps.append(dep) =20 if not ignored: - if dep_priority.ignored: + if dep_priority.ignored and \ + not self._dynamic_config._traverse_ignored_deps: if is_virt and dep.child is not None: traversed_virt_pkgs.add(dep.child) dep.child =3D None @@ -1573,7 +1574,8 @@ class depgraph(object): (virt_pkg.cpv, [str(x) for x in atoms]), noiselevel=3D-1, level=3Dlogging.DEBUG) =20 - if not dep_priority.ignored: + if not dep_priority.ignored or \ + self._dynamic_config._traverse_ignored_deps: if not self._add_pkg(virt_pkg, virt_dep): return 0 =20 @@ -1635,7 +1637,8 @@ class depgraph(object): self._dynamic_config._ignored_deps.append(dep) =20 if not ignored: - if dep_priority.ignored: + if dep_priority.ignored and \ + not self._dynamic_config._traverse_ignored_deps: if is_virt and dep.child is not None: traversed_virt_pkgs.add(dep.child) dep.child =3D None