@@ -61,6 +61,7 @@ class Config(object):

     delete_removed = False

     delete_after = False

     delete_after_fetch = False

+    max_delete = -1

     _doc['delete_removed'] = "[sync] Remove remote S3 objects when local file has been deleted"

     delay_updates = False

     gpg_passphrase = ""

@@ -513,6 +513,10 @@ test_s3cmd("Simple delete", ['del', '%s/xyz/etc2/Logo.PNG' % pbucket(1)],

     must_find = [ "File %s/xyz/etc2/Logo.PNG deleted" % pbucket(1) ])

+## ====== Recursive delete maximum exceeed

+test_s3cmd("Recursive delete maximum exceeded", ['del', '--recursive', '--max-delete=1', '--exclude', 'Atomic*', '%s/xyz/etc' % pbucket(1)],

+    must_not_find = [ "File %s/xyz/etc/TypeRa.ttf deleted" % pbucket(1) ])

+

 ## ====== Recursive delete

 test_s3cmd("Recursive delete", ['del', '--recursive', '--exclude', 'Atomic*', '%s/xyz/etc' % pbucket(1)],

     must_find = [ "File %s/xyz/etc/TypeRa.ttf deleted" % pbucket(1) ],

@@ -505,6 +505,9 @@ def subcmd_object_del_uri(uri_str, recursive = None):

     remote_count = len(remote_list)

     info(u"Summary: %d remote files to delete" % remote_count)

+    if cfg.max_delete > 0 and remote_count > cfg.max_delete:

+        warning(u"delete: maximum requested number of deletes would be exceeded, none performed.")

+        return

     if cfg.dry_run:

         for key in exclude_list:

@@ -623,6 +626,9 @@ def cmd_info(args):

 def cmd_sync_remote2remote(args):

     def _do_deletes(s3, dst_list):

+        if cfg.max_delete > 0 and len(dst_list) > cfg.max_delete:

+            warning(u"delete: maximum requested number of deletes would be exceeded, none performed.")

+            return

         # Delete items in destination that are not in source

         if cfg.dry_run:

             for key in dst_list:

@@ -719,6 +725,9 @@ def cmd_sync_remote2remote(args):

 def cmd_sync_remote2local(args):

     def _do_deletes(local_list):

+        if cfg.max_delete > 0 and len(local_list) > cfg.max_delete:

+            warning(u"delete: maximum requested number of deletes would be exceeded, none performed.")

+            return

         for key in local_list:

             os.unlink(local_list[key]['full_name'])

             output(u"deleted: %s" % local_list[key]['full_name_unicode'])

@@ -982,6 +991,9 @@ def cmd_sync_local2remote(args):

         return { 'x-amz-meta-s3cmd-attrs' : result[:-1] }

     def _do_deletes(s3, remote_list):

+        if cfg.max_delete > 0 and len(remote_list) > cfg.max_delete:

+            warning(u"delete: maximum requested number of deletes would be exceeded, none performed.")

+            return

         for key in remote_list:

             uri = S3Uri(remote_list[key]['object_uri_str'])

             s3.object_delete(uri)

@@ -1772,6 +1784,7 @@ def main():

     optparser.add_option(      "--no-delete-removed", dest="delete_removed", action="store_false", help="Don't delete remote objects.")

     optparser.add_option(      "--delete-after", dest="delete_after", action="store_true", help="Perform deletes after new uploads [sync]")

     optparser.add_option(      "--delay-updates", dest="delay_updates", action="store_true", help="Put all updated files into place at end [sync]")

+    optparser.add_option(      "--max-delete", dest="max_delete", action="store", help="Do not delete more than NUM files. [del] and [sync]", metavar="NUM")

     optparser.add_option(      "--add-destination", dest="additional_destinations", action="append", help="Additional destination for parallel uploads, in addition to last arg.  May be repeated.")

     optparser.add_option(      "--delete-after-fetch", dest="delete_after_fetch", action="store_true", help="Delete remote objects after fetching to local file (only for [get] and [sync] commands).")

     optparser.add_option("-p", "--preserve", dest="preserve_attrs", action="store_true", help="Preserve filesystem attributes (mode, ownership, timestamps). Default for [sync] command.")

@@ -195,6 +195,9 @@ Additional destination for parallel uploads, in addition to last arg.  May be re

 \fB\-\-delete\-after\-fetch\fR

 Delete remote objects after fetching to local file (only for [get] and [sync] commands).

 .TP

+\fB\-\-max\-delete\fR=NUM 

+Do not delete more than NUM files.  If that limit would be exceeded, a warning is output and none are deleted. [del] and [sync]

+.TP

 \fB\-p\fR, \fB\-\-preserve\fR

 Preserve filesystem attributes (mode, ownership, timestamps). Default for [sync] command.

 .TP