Merge pull request #4457 from mbarrin/devel

Fixed crash when s3 bucket did not exist for put operation
2013-10-11 08:18:51 -07:00 · 2013-10-11 08:18:51 -07:00 · aeccb4c06e
commit aeccb4c06e
parent 878fd17bc6 e16e77249f
1 changed files with 2 additions and 1 deletions
--- a/cloud/s3
+++ b/cloud/s3
@ -371,7 +371,8 @@ def main():
        
        # Lets check to see if bucket exists to get ground truth.
        bucketrtn = bucket_check(module, s3, bucket)
-        keyrtn = key_check(module, s3, bucket, obj)
+        if bucketrtn is True:
+            keyrtn = key_check(module, s3, bucket, obj)

        # Lets check key state. Does it exist and if it does, compute the etag md5sum.
        if bucketrtn is True and keyrtn is True: