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 829EA138CBB for ; Tue, 3 Mar 2015 21:28:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 163D3E092F; Tue, 3 Mar 2015 21:28:16 +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 B6113E092F for ; Tue, 3 Mar 2015 21:28:15 +0000 (UTC) Received: from manakin.gentoo.org (static-108-28-123-98.washdc.fios.verizon.net [108.28.123.98]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CFF1F340A95 for ; Tue, 3 Mar 2015 21:28:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by manakin.gentoo.org (Postfix) with ESMTP id 164EC603E9 for ; Tue, 3 Mar 2015 21:28:14 +0000 (UTC) From: "git@oystercatcher mirror+tproxy" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "git@oystercatcher mirror+tproxy" Message-ID: <1425418038.27eecce94b4e897f13d9f4bae129db37368895c9.git@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: git X-VCS-Committer-Name: git@oystercatcher mirror+tproxy X-VCS-Revision: 27eecce94b4e897f13d9f4bae129db37368895c9 X-VCS-Branch: master Date: Tue, 3 Mar 2015 21:28:14 +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: 094015da-c412-4619-9067-6994c82616ac X-Archives-Hash: 4f0f7362645531e5ffddb2474309f166 commit: 27eecce94b4e897f13d9f4bae129db37368895c9 Author: Zac Medico gentoo org> AuthorDate: Sun Mar 1 03:17:54 2015 +0000 Commit: git@oystercatcher mirror+tproxy oystercatcher gentoo org> CommitDate: Tue Mar 3 21:27:18 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=27eecce9 depgraph: fix 'operation' AttributeError (bug 541754) Since commit 4f5e4f697e2593df164fc9864893768f7d2375fc, this faulty code has gone unreported because it's only triggered by invalid dependencies in /var/db/pkg. Fixes: 4f5e4f697e25 ("Use Package instance attributes to clean up and simplify depgraph.validate_blockers().") X-Gentoo-Bug: 541754 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=541754 Acked-by: Brian Dolbec gentoo.org> pym/_emerge/depgraph.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index e8a3110..37292a6 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -6595,7 +6595,7 @@ class depgraph(object): if not success: replacement_pkgs = self._dynamic_config._package_tracker.match( myroot, pkg.slot_atom) - if any(replacement_pkg[0].operation == "merge" for \ + if any(replacement_pkg.operation == "merge" for replacement_pkg in replacement_pkgs): # This package is being replaced anyway, so # ignore invalid dependencies so as not to