From: wmorgan <wmorgan@5c8cc53c-5e98-4d25-b20a-d8db53a31250>
Date: Wed, 29 Aug 2007 17:10:34 +0000 (+0000)
Subject: (again) s/deleted/dropped for clarify
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=fe20a6315dcc4053566a89b92fa01f14f40533d0;p=sup

(again) s/deleted/dropped for clarify

git-svn-id: svn://rubyforge.org/var/svn/sup/trunk@552 5c8cc53c-5e98-4d25-b20a-d8db53a31250
---

diff --git a/bin/sup-sync-back b/bin/sup-sync-back
index 90fa0d5..ba2aa67 100644
--- a/bin/sup-sync-back
+++ b/bin/sup-sync-back
@@ -75,7 +75,7 @@ begin
     end
 
     source.reset!
-    num_deleted = num_moved = num_scanned = 0
+    num_dropped = num_moved = num_scanned = 0
     
     out_fp = Tempfile.new "sup-sync-back-#{source.id}"
     Redwood::PollManager.add_messages_from source do |m, offset, entry|
@@ -87,7 +87,7 @@ begin
         if labels.member? :deleted
           if opts[:delete_deleted]
             puts "Dropping deleted message #{source}##{offset}" if opts[:verbose]
-            num_deleted += 1
+            num_dropped += 1
           elsif opts[:move_deleted] && labels.member?(:deleted)
             puts "Moving deleted message #{source}##{offset}" if opts[:verbose]
             save m, deleted_fp unless opts[:dry_run]
@@ -96,8 +96,8 @@ begin
 
         elsif labels.member? :spam
           if opts[:delete_spam]
-            puts "Deleting spam message #{source}##{offset}" if opts[:verbose]
-            num_deleted += 1
+            puts "Dropping spam message #{source}##{offset}" if opts[:verbose]
+            num_dropped += 1
           elsif opts[:move_spam] && labels.member?(:spam)
             puts "Moving spam message #{source}##{offset}" if opts[:verbose]
             save m, spam_fp unless opts[:dry_run]
@@ -112,11 +112,11 @@ begin
 
       nil # don't actually add anything!
     end
-    $stderr.puts "Scanned #{num_scanned}, dropped #{num_deleted}, moved #{num_moved} messages from #{source}."
-    modified_sources << source if num_deleted > 0 || num_moved > 0
+    $stderr.puts "Scanned #{num_scanned}, dropped #{num_dropped}, moved #{num_moved} messages from #{source}."
+    modified_sources << source if num_dropped > 0 || num_moved > 0
     out_fp.close unless opts[:dry_run]
 
-    unless opts[:dry_run] || (num_deleted == 0 && num_moved == 0)
+    unless opts[:dry_run] || (num_dropped == 0 && num_moved == 0)
       deleted_fp.flush if deleted_fp
       spam_fp.flush if spam_fp
       $stderr.puts "Moving #{out_fp.path} to #{source.file_path}"