Merge branches 'completions-hook', 'find-horizontally', 'startup-hook' and 'message...

[sup] / bin / sup-sync

diff --git a/bin/sup-sync b/bin/sup-sync
index 611afc4c6ccdfbd42120fcd7071216ac98fc72aa..ac5caf6c6b724e2df48db24afb46994e8cfaa683 100644 (file)
--- a/bin/sup-sync
+++ b/bin/sup-sync
@@ -133,7 +133,7 @@ begin
     num_added = num_updated = num_scanned = num_restored = 0
     last_info_time = start_time = Time.now
 
-    Redwood::PollManager.add_messages_from source do |m, offset, entry|
+    Redwood::PollManager.add_messages_from source, :force_overwrite => true do |m, offset, entry|
       num_scanned += 1
       seen[m.id] = true
 
@@ -227,6 +227,8 @@ begin
     $stderr.puts "Deleted #{num_del} / #{num_scanned} messages"
   end
 
+  index.save
+
   if opts[:optimize]
     $stderr.puts "Optimizing index..."
     optt = time { index.index.optimize unless opts[:dry_run] }
@@ -238,7 +240,6 @@ rescue Exception => e
   File.open("sup-exception-log.txt", "w") { |f| f.puts e.backtrace }
   raise
 ensure
-  #index.save # actually, don't want to save!
   Redwood::finish
   index.unlock
 end