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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EAC4B158020 for ; Thu, 17 Nov 2022 23:40:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 25720E08ED; Thu, 17 Nov 2022 23:40:43 +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 05ADDE08ED for ; Thu, 17 Nov 2022 23:40:43 +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 E567E340FCA for ; Thu, 17 Nov 2022 23:40:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 348893A5 for ; Thu, 17 Nov 2022 23:40:40 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1668728385.0601ad81033983b5aca31bbc3f75f2f995c40be4.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:catalyst-3.0-stable commit in: catalyst/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/support.py X-VCS-Directories: catalyst/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 0601ad81033983b5aca31bbc3f75f2f995c40be4 X-VCS-Branch: catalyst-3.0-stable Date: Thu, 17 Nov 2022 23:40:40 +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: 82daf7f5-59ae-4d5b-a339-10651add0896 X-Archives-Hash: f893df636fbb13ca45ead3441fa7469e commit: 0601ad81033983b5aca31bbc3f75f2f995c40be4 Author: Matt Turner gentoo org> AuthorDate: Wed Feb 16 22:33:17 2022 +0000 Commit: Matt Turner gentoo org> CommitDate: Thu Nov 17 23:39:45 2022 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0601ad81 catalyst: Add .sha256 to list of ignored extensions Otherwise the presence of a .sha256 file would cause this error: ERROR:catalyst:CatalystError: Ambiguous Filename: /home/catalyst/builds/default/stage3-ia64-openrc-20220216T032203Z ERROR:catalyst:Please specify the correct extension as well Fixes: 7457cd3b ("catalyst: generate .sha256 file if any digest is enabled") Closes: https://bugs.gentoo.org/881705 Signed-off-by: Matt Turner gentoo.org> (cherry picked from commit 1a8d6cd3d31f960755c3237679539d9cab175bc6) catalyst/support.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/catalyst/support.py b/catalyst/support.py index 7743b142..6f49d4bf 100644 --- a/catalyst/support.py +++ b/catalyst/support.py @@ -64,8 +64,11 @@ def file_check(filepath, extensions=None, strict=True): # so check if there are files of that name with an extension files = glob.glob("%s.*" % filepath) # remove any false positive files - files = [x for x in files if not x.endswith(".CONTENTS") and not - x.endswith(".CONTENTS.gz") and not x.endswith(".DIGESTS")] + files = [x for x in files if + not x.endswith(".CONTENTS") and + not x.endswith(".CONTENTS.gz") and + not x.endswith(".DIGESTS") and + not x.endswith(".sha256")] if len(files) is 1: return files[0]