Commit 6c6523aa by Michael DeHaan

Merge pull request #6747 from ciupicri/cloud-bugfix

Bugfix for gc_storage and s3
parents c308b987 d89d2432
...@@ -152,7 +152,8 @@ def key_check(module, gs, bucket, obj): ...@@ -152,7 +152,8 @@ def key_check(module, gs, bucket, obj):
def keysum(module, gs, bucket, obj): def keysum(module, gs, bucket, obj):
bucket = gs.lookup(bucket) bucket = gs.lookup(bucket)
key_check = bucket.get_key(obj) key_check = bucket.get_key(obj)
if key_check: if not key_check:
return None
md5_remote = key_check.etag[1:-1] md5_remote = key_check.etag[1:-1]
etag_multipart = '-' in md5_remote # Check for multipart, etag is not md5 etag_multipart = '-' in md5_remote # Check for multipart, etag is not md5
if etag_multipart is True: if etag_multipart is True:
......
...@@ -145,7 +145,8 @@ def key_check(module, s3, bucket, obj): ...@@ -145,7 +145,8 @@ def key_check(module, s3, bucket, obj):
def keysum(module, s3, bucket, obj): def keysum(module, s3, bucket, obj):
bucket = s3.lookup(bucket) bucket = s3.lookup(bucket)
key_check = bucket.get_key(obj) key_check = bucket.get_key(obj)
if key_check: if not key_check:
return None
md5_remote = key_check.etag[1:-1] md5_remote = key_check.etag[1:-1]
etag_multipart = '-' in md5_remote # Check for multipart, etag is not md5 etag_multipart = '-' in md5_remote # Check for multipart, etag is not md5
if etag_multipart is True: if etag_multipart is True:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment