diff options
| -rw-r--r-- | xtesting/core/campaign.py | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/xtesting/core/campaign.py b/xtesting/core/campaign.py index 2c16dfac..66f8182c 100644 --- a/xtesting/core/campaign.py +++ b/xtesting/core/campaign.py @@ -127,19 +127,22 @@ class Campaign(): prefix = os.path.join(s3path, build_tag) # pylint: disable=no-member for s3_object in b3resource.Bucket(bucket_name).objects.filter( - Prefix="{}/".format(prefix)): - path, _ = os.path.split(s3_object.key) - lpath = re.sub('^{}/*'.format(s3path), '', path) + Prefix=f"{prefix}/"): + path, _ = os.path.split( + urllib.parse.unquote_plus(s3_object.key)) + lpath = re.sub(f'^{s3path}/*', '', path) if lpath and not os.path.exists(lpath): os.makedirs(lpath) + Campaign.__logger.info( + "Downloading %s", + re.sub(f'^{s3path}/*', '', + urllib.parse.unquote_plus(s3_object.key))) # pylint: disable=no-member b3resource.Bucket(bucket_name).download_file( - s3_object.key, - re.sub(f'^{s3path}/*', '', s3_object.key), + urllib.parse.unquote_plus(s3_object.key), + re.sub(f'^{s3path}/*', '', + urllib.parse.unquote_plus(s3_object.key)), Config=tconfig) - Campaign.__logger.info( - "Downloading %s", - re.sub('^{}/*'.format(s3path), '', s3_object.key)) return Campaign.EX_OK except Exception: # pylint: disable=broad-except Campaign.__logger.exception("Cannot publish the artifacts") |