...
|
...
|
@@ -242,7 +242,7 @@ def cmd_website_delete(args):
|
242
|
242
|
raise
|
243
|
243
|
|
244
|
244
|
def cmd_bucket_delete(args):
|
245
|
|
- def _bucket_delete_one(uri, args = None):
|
|
245
|
+ def _bucket_delete_one(uri):
|
246
|
246
|
try:
|
247
|
247
|
response = s3.bucket_delete(uri.bucket())
|
248
|
248
|
output(u"Bucket '%s' removed" % uri.uri())
|
...
|
...
|
@@ -559,8 +559,7 @@ 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,
|
563
|
|
- batch_mode = batch_mode, uri_params = batch_uri_args)
|
|
562
|
+ remote_list = fetch_remote_list(uri_str, require_attribs = False, recursive = recursive)
|
564
|
563
|
remote_list, exclude_list = filter_exclude_include(remote_list)
|
565
|
564
|
|
566
|
565
|
remote_count = len(remote_list)
|