Browse code

conflict merge

Vasileios Mitrousis authored on 2014/03/04 04:09:36
Showing 1 changed files
... ...
@@ -244,6 +244,7 @@ def cmd_website_delete(args):
244 244
 def cmd_bucket_delete(args):
245 245
     def _bucket_delete_one(uri, args = None):
246 246
         try:
247
+            marker = args.get('marker', '') if args else ''
247 248
             response = s3.bucket_delete(uri.bucket())
248 249
             output(u"Bucket '%s' removed" % uri.uri())
249 250
         except S3Error, e:
... ...
@@ -559,7 +560,8 @@ def subcmd_object_del_uri(uri_str, recursive = None):
559 559
     if recursive is None:
560 560
         recursive = cfg.recursive
561 561
 
562
-    remote_list = fetch_remote_list(uri_str, require_attribs = False, recursive = recursive)
562
+    remote_list = fetch_remote_list(uri_str, require_attribs = False, recursive = recursive,
563
+                                    batch_mode = batch_mode, uri_params = batch_uri_args)
563 564
     remote_list, exclude_list = filter_exclude_include(remote_list)
564 565
 
565 566
     remote_count = len(remote_list)