external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-10-30 18:50:53 +00:00
Code Issues Releases Wiki Activity

The list_target_files() function correctly handles an empty S3 bucket.

Browse Source
This commit is contained in:
pappapisshu 2023-02-09 00:22:31 +01:00
parent 673a0e58ec
commit 928ca81397
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
management/backup.py
View File

@ -502,8 +502,10 @@ def list_target_files(config):
aws_access_key_id=config["s3_access_key_id"], \ aws_access_key_id=config["s3_access_key_id"], \
aws_secret_access_key=config["s3_secret_access_key"]) aws_secret_access_key=config["s3_secret_access_key"])
bucket_objects = s3.list_objects_v2(Bucket=bucket, Prefix=path)['Contents'] backup_list = []
backup_list = [(key['Key'][len(path):], key['Size']) for key in bucket_objects] bucket_objects = s3.list_objects_v2(Bucket=bucket, Prefix=path)
if "Contents" in bucket_objects:
backup_list = [(key['Key'][len(path):], key['Size']) for key in bucket_objects['Contents']]
except ClientError as e: except ClientError as e:
raise ValueError(e) raise ValueError(e)
return backup_list return backup_list