diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2022-02-16 14:33:17 -0800 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2022-11-17 18:39:45 -0500 |
| commit | 0601ad81033983b5aca31bbc3f75f2f995c40be4 (patch) | |
| tree | e87895399ea038a74b38e0f02b870db86e4ac9d0 | |
| parent | arch: Add loong (diff) | |
| download | catalyst-3.0-stable.tar.gz catalyst-3.0-stable.tar.bz2 catalyst-3.0-stable.zip | |
catalyst: Add .sha256 to list of ignored extensionscatalyst-3.0-stable
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@gentoo.org>
(cherry picked from commit 1a8d6cd3d31f960755c3237679539d9cab175bc6)
| -rw-r--r-- | catalyst/support.py | 7 |
1 files 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] |