Merge pull request #532 from ddzialak/master

fix simply error in setlifecycle command
s3tools · Apr 23, 2015 · 1d3e3c0 · 1d3e3c0
2 parents 5986e24 + f5415b4
commit 1d3e3c0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/S3/S3.py b/S3/S3.py
@@ -815,7 +815,7 @@ def set_lifecycle_policy(self, uri, policy):
         headers['content-md5'] = compute_content_md5(policy)
         request = self.create_request("BUCKET_CREATE", uri = uri,
                                       extra = "?lifecycle", headers=headers, body = policy)
-        debug(u"set_lifecycle_policy(%s): policy-xml: %s" % (uri))
+        debug(u"set_lifecycle_policy(%s): policy-xml: %s" % (uri, policy))
         response = self.send_request(request)
         return response
 

diff --git a/s3cmd b/s3cmd
@@ -1596,7 +1596,7 @@ def cmd_setlifecycle(args):
     response = s3.set_lifecycle_policy(uri, lifecycle_policy)
 
     debug(u"response - %s" % response['status'])
-    if response['status'] == 204:
+    if response['status'] == 200:
         output(u"%s: Lifecycle Policy updated" % uri)
     return EX_OK
 
@@ -2050,7 +2050,7 @@ def get_commands_list():
 
     ## Lifecycle commands
     {"cmd":"expire", "label":"Set or delete expiration rule for the bucket", "param":"s3://BUCKET", "func":cmd_expiration_set, "argc":1},
-    {"cmd":"setlifecycle", "label":"Upload a lifecycle policy for the bucket", "param":"s3://BUCKET", "func":cmd_setlifecycle, "argc":1},
+    {"cmd":"setlifecycle", "label":"Upload a lifecycle policy for the bucket", "param":"FILE s3://BUCKET", "func":cmd_setlifecycle, "argc":2},
     {"cmd":"dellifecycle", "label":"Remove a lifecycle policy for the bucket", "param":"s3://BUCKET", "func":cmd_dellifecycle, "argc":1},
 
     ## CloudFront commands