зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1254422 - Do not try to set S3 ACLs r=jlund a=release
MozReview-Commit-ID: 1RyB48KhFvD --HG-- extra : source : d5370c00e1eb31a2f9de7750a0cb1747c277e1ed
This commit is contained in:
Родитель
727d7d0948
Коммит
da94a314aa
|
@ -277,14 +277,8 @@ class BeetMover(BaseScript, VirtualenvMixin, object):
|
|||
if not key:
|
||||
self.info("Uploading to `{}`".format(s3_key))
|
||||
key = bucket.new_key(s3_key)
|
||||
|
||||
# set key value
|
||||
self.retry(key.set_contents_from_filename, args=[source], error_level=FATAL),
|
||||
|
||||
# key.make_public() may lead to race conditions, because
|
||||
# it doesn't pass version_id, so it may not set permissions
|
||||
bucket.set_canned_acl(acl_str='public-read', key_name=s3_key,
|
||||
version_id=key.version_id)
|
||||
else:
|
||||
if not get_hash(key.get_contents_as_string()) == get_hash(open(source).read()):
|
||||
# for now, let's halt. If necessary, we can revisit this and allow for overwrites
|
||||
|
|
Загрузка…
Ссылка в новой задаче