|
|
@ -296,6 +296,15 @@ def is_walrus(s3_url):
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def get_md5_digest(local_file):
|
|
|
|
|
|
|
|
md5 = hashlib.md5()
|
|
|
|
|
|
|
|
with open(local_file, 'rb') as f:
|
|
|
|
|
|
|
|
while True:
|
|
|
|
|
|
|
|
data = f.read(1024 ** 2)
|
|
|
|
|
|
|
|
if not data: break
|
|
|
|
|
|
|
|
md5.update(data)
|
|
|
|
|
|
|
|
return md5.hexdigest()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def main():
|
|
|
|
def main():
|
|
|
|
argument_spec = ec2_argument_spec()
|
|
|
|
argument_spec = ec2_argument_spec()
|
|
|
@ -410,7 +419,7 @@ def main():
|
|
|
|
# Compare the remote MD5 sum of the object with the local dest md5sum, if it already exists.
|
|
|
|
# Compare the remote MD5 sum of the object with the local dest md5sum, if it already exists.
|
|
|
|
if pathrtn is True:
|
|
|
|
if pathrtn is True:
|
|
|
|
md5_remote = keysum(module, s3, bucket, obj)
|
|
|
|
md5_remote = keysum(module, s3, bucket, obj)
|
|
|
|
md5_local = hashlib.md5(open(dest, 'rb').read()).hexdigest()
|
|
|
|
md5_local = get_md5_digest(dest)
|
|
|
|
if md5_local == md5_remote:
|
|
|
|
if md5_local == md5_remote:
|
|
|
|
sum_matches = True
|
|
|
|
sum_matches = True
|
|
|
|
if overwrite == 'always':
|
|
|
|
if overwrite == 'always':
|
|
|
@ -454,7 +463,8 @@ def main():
|
|
|
|
# Lets check key state. Does it exist and if it does, compute the etag md5sum.
|
|
|
|
# Lets check key state. Does it exist and if it does, compute the etag md5sum.
|
|
|
|
if bucketrtn is True and keyrtn is True:
|
|
|
|
if bucketrtn is True and keyrtn is True:
|
|
|
|
md5_remote = keysum(module, s3, bucket, obj)
|
|
|
|
md5_remote = keysum(module, s3, bucket, obj)
|
|
|
|
md5_local = hashlib.md5(open(src, 'rb').read()).hexdigest()
|
|
|
|
md5_local = get_md5_digest(src)
|
|
|
|
|
|
|
|
|
|
|
|
if md5_local == md5_remote:
|
|
|
|
if md5_local == md5_remote:
|
|
|
|
sum_matches = True
|
|
|
|
sum_matches = True
|
|
|
|
if overwrite == 'always':
|
|
|
|
if overwrite == 'always':
|
|
|
|