From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0B5D3158091 for ; Sun, 5 Jun 2022 20:25:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F167AE0882; Sun, 5 Jun 2022 20:25:16 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D12AFE0882 for ; Sun, 5 Jun 2022 20:25:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 68B2A3417DC for ; Sun, 5 Jun 2022 20:25:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B59893B8 for ; Sun, 5 Jun 2022 20:25:13 +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: <1654460689.2feeb57c0a260d308b55c8be943c73fc1fa44910.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/manifest.py X-VCS-Directories: lib/portage/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 2feeb57c0a260d308b55c8be943c73fc1fa44910 X-VCS-Branch: master Date: Sun, 5 Jun 2022 20:25:13 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8a220795-940b-44c0-b372-9dabe0f34ec6 X-Archives-Hash: 3b9f7997b7b4963764d77ece83f098f8 commit: 2feeb57c0a260d308b55c8be943c73fc1fa44910 Author: Zac Medico gentoo org> AuthorDate: Sun Jun 5 20:20:18 2022 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Jun 5 20:24:49 2022 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=2feeb57c Manifest: Fix ("size",) tuple Fixes: 9e24d0143450 ("Simplify with declarative programming") Bug: https://bugs.gentoo.org/849815 Signed-off-by: Zac Medico gentoo.org> lib/portage/manifest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/portage/manifest.py b/lib/portage/manifest.py index a5b26c130..65dda211b 100644 --- a/lib/portage/manifest.py +++ b/lib/portage/manifest.py @@ -273,7 +273,7 @@ class Manifest: return myhashdict def _createManifestEntries(self): - valid_hashes = set(itertools.chain(get_valid_checksum_keys(), ("size"))) + valid_hashes = set(itertools.chain(get_valid_checksum_keys(), ("size",))) mytypes = sorted(self.fhashdict) for mytype in mytypes: myfiles = sorted(self.fhashdict[mytype]) @@ -551,7 +551,7 @@ class Manifest: # repoman passes in an empty list, which implies that all distfiles # are required. requiredDistfiles = distlist.copy() - required_hash_types = set(itertools.chain(self.required_hashes, ("size"))) + required_hash_types = set(itertools.chain(self.required_hashes, ("size",))) for f in distlist: fname = os.path.join(self.distdir, f) mystat = None