From cac210f25bc7b071903e38a9f15265e4c605c006 Mon Sep 17 00:00:00 2001 From: jromnoa Date: Tue, 15 Jun 2021 11:28:58 -0700 Subject: [PATCH] add check for files in a given path before creating full paths to the files, add output when json.loads() call fails --- scripts/build/tools/upload_to_s3.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/build/tools/upload_to_s3.py b/scripts/build/tools/upload_to_s3.py index 132929d83e..3694014056 100755 --- a/scripts/build/tools/upload_to_s3.py +++ b/scripts/build/tools/upload_to_s3.py @@ -84,12 +84,14 @@ def get_files_to_upload(base_dir, regex, search_subdirectories): # ('C:\path\to\base_dir\', ['Subfolder1', 'Subfolder2'], ['file1', 'file2']) subdirectory_file_path = subdirectory[0] subdirectory_files = subdirectory[2] - subdirectory_file_paths = _build_file_paths(subdirectory_file_path, subdirectory_files) - files.extend(subdirectory_file_paths) + if subdirectory_files: + subdirectory_file_paths = _build_file_paths(subdirectory_file_path, subdirectory_files) + files.extend(subdirectory_file_paths) try: regex = json.loads(regex) # strip the surround quotes, if they exist except: + print(f'WARNING: failed to call json.loads() for regex: "{regex}"') pass # Get all file names matching the regular expression, those file will be uploaded to S3 regex_files_to_upload = [x for x in files if re.match(regex, x)]