commit: 8cee37265f4617ac54f5aaafbe3c647dff6472fc Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com> AuthorDate: Tue Mar 14 07:09:23 2017 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Tue Mar 14 16:30:04 2017 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=8cee3726
Fix wrong cast of valid_hashes to frozenset valid_hashes must be a set, not frozenset. Closes: https://github.com/gentoo/portage/pull/138 Fixes: b33c965283 Gentoo-Bug: 612578 pym/portage/package/ebuild/fetch.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pym/portage/package/ebuild/fetch.py b/pym/portage/package/ebuild/fetch.py index 5c4b74446..0431e11ea 100644 --- a/pym/portage/package/ebuild/fetch.py +++ b/pym/portage/package/ebuild/fetch.py @@ -551,7 +551,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, distdir_writable = can_fetch and not fetch_to_ro failed_files = set() restrict_fetch_msg = False - valid_hashes = frozenset(get_valid_checksum_keys()) + valid_hashes = set(get_valid_checksum_keys()) valid_hashes.discard("size") for myfile in filedict: @@ -568,8 +568,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, if not (allow_missing_digests or listonly): verifiable_hash_types = set(orig_digests).intersection(valid_hashes) if not verifiable_hash_types: - expected = set(valid_hashes) - expected = " ".join(sorted(expected)) + expected = " ".join(sorted(valid_hashes)) got = set(orig_digests) got.discard("size") got = " ".join(sorted(got))
