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 1PlNru-00061P-Cm for garchives@archives.gentoo.org; Fri, 04 Feb 2011 15:46:42 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2A9EFE0A94; Fri, 4 Feb 2011 15:46:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id EB7E9E0A94 for ; Fri, 4 Feb 2011 15:46:34 +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 570A21B4056 for ; Fri, 4 Feb 2011 15:46:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A20B48006A for ; Fri, 4 Feb 2011 15:46:33 +0000 (UTC) To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <6503980e0e3bcfce9fbaff85c33d87f616e955a9.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: 6503980e0e3bcfce9fbaff85c33d87f616e955a9 Date: Fri, 4 Feb 2011 15:46:33 +0000 (UTC) From: zmedico@gentoo.org 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: 6c6545f7f68e0546ac0ffee7f19532c2 commit: 6503980e0e3bcfce9fbaff85c33d87f616e955a9 Author: Zac Medico gentoo org> AuthorDate: Fri Feb 4 15:41:45 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Feb 4 15:41:45 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D6503980e0e3bcfce9fbaff85c33d87f616e955a9 depgraph: don't drop deps in _add_dep This will fix bug #353613. We remove a hunk of code that was meant to limit recursion, but is obsolete an buggy. The recursion limiting is now handled by _add_pkg and the _ignored_deps stack. --- pym/_emerge/depgraph.py | 29 ----------------------------- 1 files changed, 0 insertions(+), 29 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 811eda6..4334a33 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -683,8 +683,6 @@ class depgraph(object): dep_pkg =3D dep.child existing_node =3D self._dynamic_config._slot_pkg_map[ dep.root].get(dep_pkg.slot_atom) - if existing_node is not dep_pkg: - existing_node =3D None=20 =20 if not dep_pkg: if dep.priority.optional: @@ -731,33 +729,6 @@ class depgraph(object): noiselevel=3D-1, level=3Dlogging.DEBUG) =20 return 0 - # In some cases, dep_check will return deps that shouldn't - # be proccessed any further, so they are identified and - # discarded here. Try to discard as few as possible since - # discarded dependencies reduce the amount of information - # available for optimization of merge order. - if dep.priority.satisfied and \ - dep.priority.satisfied.visible and \ - not dep_pkg.installed and \ - not (existing_node or recurse): - myarg =3D None - if dep.root =3D=3D self._frozen_config.target_root: - try: - myarg =3D next(self._iter_atoms_for_pkg(dep_pkg)) - except StopIteration: - pass - except portage.exception.InvalidDependString: - if not dep_pkg.installed: - # This shouldn't happen since the package - # should have been masked. - raise - if not myarg: - # Existing child selection may not be valid unless - # it's added to the graph immediately, since "complete" - # mode may select a different child later. - dep.child =3D None - self._dynamic_config._ignored_deps.append(dep) - return 1 =20 if not self._add_pkg(dep_pkg, dep): return 0