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 1QHgft-0001FV-Qt for garchives@archives.gentoo.org; Wed, 04 May 2011 18:19:50 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 401C71C015; Wed, 4 May 2011 18:19:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 00EBB1C015 for ; Wed, 4 May 2011 18:19:41 +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 76AE11B4075 for ; Wed, 4 May 2011 18:19:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id DD04080505 for ; Wed, 4 May 2011 18:19:40 +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: dbb89fde73049da97fdbfa157618977317440db5 Date: Wed, 4 May 2011 18:19:40 +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: 84bbecb7434309db587e8de628f5abc9 commit: dbb89fde73049da97fdbfa157618977317440db5 Author: Zac Medico gentoo org> AuthorDate: Wed May 4 18:18:34 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed May 4 18:18:34 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Ddbb89fde add_pkg_deps: use dep priority to ignore blockers --- pym/_emerge/depgraph.py | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 9dcc5b9..dd65a45 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -1351,20 +1351,17 @@ class depgraph(object): (depend_root, edepend["DEPEND"], self._priority(buildtime=3DTrue, optional=3D(pkg.built or ignore_build_time_deps), - ignored=3Dignore_build_time_deps), - pkg.built or ignore_build_time_deps), + ignored=3Dignore_build_time_deps)), (myroot, edepend["RDEPEND"], - self._priority(runtime=3DTrue), - False), + self._priority(runtime=3DTrue)), (myroot, edepend["PDEPEND"], - self._priority(runtime_post=3DTrue), - False) + self._priority(runtime_post=3DTrue)) ) =20 debug =3D "--debug" in self._frozen_config.myopts strict =3D mytype !=3D "installed" =20 - for dep_root, dep_string, dep_priority, ignore_blockers in deps: + for dep_root, dep_string, dep_priority in deps: if not dep_string: continue if debug: @@ -1415,14 +1412,14 @@ class depgraph(object): =20 if not self._add_pkg_dep_string( pkg, dep_root, dep_priority, dep_string, - allow_unsatisfied, ignore_blockers=3Dignore_blockers): + allow_unsatisfied): return 0 =20 self._dynamic_config._traversed_pkg_deps.add(pkg) return 1 =20 def _add_pkg_dep_string(self, pkg, dep_root, dep_priority, dep_string, - allow_unsatisfied, ignore_blockers=3DFalse): + allow_unsatisfied): _autounmask_backup =3D self._dynamic_config._autounmask if dep_priority.optional or dep_priority.ignored: # Temporarily disable autounmask for deps that @@ -1431,12 +1428,12 @@ class depgraph(object): try: return self._wrapped_add_pkg_dep_string( pkg, dep_root, dep_priority, dep_string, - allow_unsatisfied, ignore_blockers=3Dignore_blockers) + allow_unsatisfied) finally: self._dynamic_config._autounmask =3D _autounmask_backup =20 def _wrapped_add_pkg_dep_string(self, pkg, dep_root, dep_priority, - dep_string, allow_unsatisfied, ignore_blockers=3DFalse): + dep_string, allow_unsatisfied): depth =3D pkg.depth + 1 deep =3D self._dynamic_config.myparams.get("deep", 0) recurse_satisfied =3D deep is True or depth <=3D deep @@ -1483,7 +1480,8 @@ class depgraph(object): is_virt =3D hasattr(atom, '_orig_atom') atom =3D getattr(atom, '_orig_atom', atom) =20 - if ignore_blockers and atom.blocker: + if atom.blocker and \ + (dep_priority.optional or dep_priority.ignored): # For --with-bdeps, ignore build-time only blockers # that originate from built packages. continue