commit: 0601ad81033983b5aca31bbc3f75f2f995c40be4
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 22:33:17 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> 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 <mattst88 <AT> 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]
