From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D28021391DB for ; Mon, 24 Mar 2014 18:28:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F794E0A76; Mon, 24 Mar 2014 18:28:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 28242E0A76 for ; Mon, 24 Mar 2014 18:28:31 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 078A533F6C7 for ; Mon, 24 Mar 2014 18:28:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id C0060188F1 for ; Mon, 24 Mar 2014 18:28:28 +0000 (UTC) From: "Sebastian Luther" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Luther" Message-ID: <1395681093.d10a23b9c744a353772d0be89ba5f49a34b5220d.few@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: few X-VCS-Committer-Name: Sebastian Luther X-VCS-Revision: d10a23b9c744a353772d0be89ba5f49a34b5220d X-VCS-Branch: master Date: Mon, 24 Mar 2014 18:28:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2613a73c-2aa6-4ca4-8b36-12e9d92c6985 X-Archives-Hash: 1f7cdf501bf7e2486413005722944ef2 commit: d10a23b9c744a353772d0be89ba5f49a34b5220d Author: Sebastian Luther gmx de> AuthorDate: Mon Mar 24 17:11:33 2014 +0000 Commit: Sebastian Luther gmx de > CommitDate: Mon Mar 24 17:11:33 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d10a23b9 Fix bug in _remove_pkg logic (bug 505422) --- pym/_emerge/depgraph.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 04d7aae..f27e855 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -2431,7 +2431,8 @@ class depgraph(object): self._dynamic_config._blocked_world_pkgs.pop(pkg, None) for child in children: - if not self._dynamic_config.digraph.parent_nodes(child): + if child in self._dynamic_config.digraph and \ + not self._dynamic_config.digraph.parent_nodes(child): self._remove_pkg(child) # Clear caches.