@@ -581,18 +581,18 @@ def cmd_info(args):

             else:

                 raise

-def do_deletes(s3, dst_list):

-    # Delete items in destination that are not in source

-    if cfg.dry_run:

-        for key in dst_list:

-            output(u"delete: %s" % dst_list[key]['object_uri_str'])

-    else:

-        for key in dst_list:

-            uri = S3Uri(dst_list[key]['object_uri_str'])

-            s3.object_delete(uri)

-            output(u"deleted: '%s'" % uri)

-

 def cmd_sync_remote2remote(args):

+    def _do_deletes(s3, dst_list):

+        # Delete items in destination that are not in source

+        if cfg.dry_run:

+            for key in dst_list:

+                output(u"delete: %s" % dst_list[key]['object_uri_str'])

+        else:

+            for key in dst_list:

+                uri = S3Uri(dst_list[key]['object_uri_str'])

+                s3.object_delete(uri)

+                output(u"deleted: '%s'" % uri)

+

     s3 = S3(Config())

     # Normalise s3://uri (e.g. assert trailing slash)

@@ -633,7 +633,7 @@ def cmd_sync_remote2remote(args):

     # Delete items in destination that are not in source

     if cfg.delete_removed and not cfg.delete_after:

-        do_deletes(s3, dst_list)

+        _do_deletes(s3, dst_list)

     # Perform the synchronization of files

     timestamp_start = time.time()

@@ -661,7 +661,7 @@ def cmd_sync_remote2remote(args):

     # Delete items in destination that are not in source

     if cfg.delete_removed and cfg.delete_after:

-        do_deletes(s3, dst_list)

+        _do_deletes(s3, dst_list)

 def cmd_sync_remote2local(args):

     def _parse_attrs_header(attrs_header):

@@ -671,6 +671,11 @@ def cmd_sync_remote2local(args):

             attrs[key] = val

         return attrs

+    def _do_deletes(local_list):

+        for key in local_list:

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

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

+

     s3 = S3(Config())

     destination_base = args[-1]

@@ -717,10 +722,8 @@ def cmd_sync_remote2local(args):

         warning(u"Exitting now because of --dry-run")

         return

-    if cfg.delete_removed:

-        for key in local_list:

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

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

+    if cfg.delete_removed and not cfg.delete_after:

+        _do_deletes(local_list)

     total_size = 0

     total_elapsed = 0.0

@@ -812,6 +815,9 @@ def cmd_sync_remote2local(args):

     else:

         info(outstr)

+    if cfg.delete_removed and cfg.delete_after:

+        _do_deletes(local_list)

+

 def cmd_sync_local2remote(args):

     def _build_attr_header(src):

         import pwd, grp

@@ -843,6 +849,12 @@ def cmd_sync_local2remote(args):

         for k in attrs: result += "%s:%s/" % (k, attrs[k])

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

+    def _do_deletes(s3, remote_list):

+        for key in remote_list:

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

+            s3.object_delete(uri)

+            output(u"deleted: '%s'" % uri)

+

     s3 = S3(cfg)

     if cfg.encrypt:

@@ -902,11 +914,8 @@ def cmd_sync_local2remote(args):

         warning(u"Exitting now because of --dry-run")

         return

-    if cfg.delete_removed:

-        for key in remote_list:

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

-            s3.object_delete(uri)

-            output(u"deleted: '%s'" % uri)

+    if cfg.delete_removed and not cfg.delete_after:

+        _do_deletes(s3, remote_list)

     uploaded_objects_list = []

     total_size = 0

@@ -954,6 +963,9 @@ def cmd_sync_local2remote(args):

     else:

         info(outstr)

+    if cfg.delete_removed and cfg.delete_after:

+        _do_deletes(s3, remote_list)

+

     if cfg.invalidate_on_cf:

         if len(uploaded_objects_list) == 0:

             info("Nothing to invalidate in CloudFront")