From 39ca2970a59ca8b08640685ec631b6802e0bba9b Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Thu, 7 Dec 2023 08:12:23 +1100 Subject: sb: Allow _ in downloaded file names --- source-builder/sb/download.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source-builder/sb/download.py b/source-builder/sb/download.py index 3f26644..6e6f9f2 100644 --- a/source-builder/sb/download.py +++ b/source-builder/sb/download.py @@ -132,7 +132,7 @@ def _hash_check(file_, absfile, macros, remove = True): if hasher is not None: del hasher else: - raise error.general('%s: no hash found in released RSB' % (file_)) + raise error.general('%s: no hash found' % (file_)) return not failed def _local_path(source, pathkey, config): @@ -189,7 +189,7 @@ def _http_parser(source, pathkey, config, opts): # # Wipe out everything special in the file name. # - source['file'] = re.sub(r'[^a-zA-Z0-9.\-]+', '-', source['file']) + source['file'] = re.sub(r'[^a-zA-Z0-9.\-_]+', '-', source['file']) max_file_len = 127 if len(source['file']) > max_file_len: raise error.general('file name length is greater than %i (maybe use --rsb-file=FILE option): %s' % \ -- cgit v1.2.3