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 21E181389E2 for ; Sat, 29 Nov 2014 17:55:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E3804E087F; Sat, 29 Nov 2014 17:55:41 +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 96EE2E087F for ; Sat, 29 Nov 2014 17:55:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A4B3B3403FF for ; Sat, 29 Nov 2014 17:55:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3F545B2B3 for ; Sat, 29 Nov 2014 17:55:38 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1417283398.161b85f3d4f5ba460ddb99d43c9475e160fa25f3.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: 161b85f3d4f5ba460ddb99d43c9475e160fa25f3 X-VCS-Branch: master Date: Sat, 29 Nov 2014 17:55:38 +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: bd387608-2bc3-4f76-9c2f-a28bd4c70bca X-Archives-Hash: f8a8df500b27f27b7167cbf6a2f1aa86 commit: 161b85f3d4f5ba460ddb99d43c9475e160fa25f3 Author: Zac Medico gentoo org> AuthorDate: Sat Nov 29 16:01:38 2014 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Nov 29 17:49:58 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=161b85f3 _pkg_use_enabled: return frozenset (531112) Since commit 9ba4f2aa6a2755a73fb652b4557919047d649fd1, _pkg_use_enabled needs to consistently return a frozenset, so that the result is hashable. Fixes: 9ba4f2aa6a27 ("_slot_operator_update_probe: memoize use_reduce (529660)") X-Gentoo-Bug: 531112 X-Gentoo-Url: https://bugs.gentoo.org/show_bug.cgi?id=531112 Acked-by: Brian Dolbec gentoo.org> --- pym/_emerge/depgraph.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index a0169ff..3455b6b 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -5321,6 +5321,9 @@ class depgraph(object): If target_use is given, the need changes are computed to make the package useable. Example: target_use = { "foo": True, "bar": False } The flags target_use must be in the pkg's IUSE. + @rtype: frozenset + @return: set of effectively enabled USE flags, including changes + made by autounmask """ if pkg.built: return pkg.use.enabled @@ -5387,6 +5390,10 @@ class depgraph(object): return False + # Always return frozenset since the result needs to be + # hashable (see bug #531112). + new_use = frozenset(new_use) + if new_changes != old_changes: #Don't do the change if it violates REQUIRED_USE. required_use = pkg._metadata.get("REQUIRED_USE")