|
|
|
@ -428,12 +428,11 @@ def upload_files(s3, bucket, filelist, params):
|
|
|
|
ret = []
|
|
|
|
ret = []
|
|
|
|
for entry in filelist:
|
|
|
|
for entry in filelist:
|
|
|
|
args = {
|
|
|
|
args = {
|
|
|
|
'ContentLength': entry['bytes'],
|
|
|
|
|
|
|
|
'ContentType': entry['mime_type']
|
|
|
|
'ContentType': entry['mime_type']
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if params.get('permission'):
|
|
|
|
if params.get('permission'):
|
|
|
|
args['ACL'] = params['permission']
|
|
|
|
args['ACL'] = params['permission']
|
|
|
|
s3.upload_file(entry['fullpath'], bucket, entry['s3_path'], ExtraArgs=None, Callback=None, Config=None)
|
|
|
|
s3.upload_file(entry['fullpath'], bucket, entry['s3_path'], ExtraArgs=args, Callback=None, Config=None)
|
|
|
|
ret.append(entry)
|
|
|
|
ret.append(entry)
|
|
|
|
return ret
|
|
|
|
return ret
|
|
|
|
|
|
|
|
|
|
|
|
|