From: wmorgan <wmorgan@5c8cc53c-5e98-4d25-b20a-d8db53a31250>
Date: Tue, 9 Jan 2007 16:51:21 +0000 (+0000)
Subject: fixed label brokenness introduced in last version
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=927144cb2a14458303f25a005217ac6314a08483;p=sup

fixed label brokenness introduced in last version


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

diff --git a/bin/sup-import b/bin/sup-import
index 4150bbf..703f125 100644
--- a/bin/sup-import
+++ b/bin/sup-import
@@ -197,9 +197,15 @@ begin
         if (rebuild || force_rebuild) && (docid, entry = index.load_entry_for_id(m.id)) && entry
           oldlabels = entry[:label].split(" ").sort
           newlabels = labels.map { |x| x.to_s }.sort
+
           if force_rebuild || entry[:source_info].to_i != offset || (overwrite_labels && (oldlabels != newlabels))
-            puts "replacing message #{m.id}: offset #{entry[:source_info]} => #{offset}, labels #{oldlabels * ' '} => #{newlabels * ' '}"
-            m.labels = newlabels.map { |l| l.intern } if overwrite_labels
+            if overwrite_labels
+              puts "replacing message #{m.id}: offset #{entry[:source_info]} => #{offset}, labels #{oldlabels * ' '} => #{newlabels * ' '}"
+              m.labels = newlabels.map { |l| l.intern }              
+            else
+              puts "replacing message #{m.id}: offset #{entry[:source_info]} => #{offset}"
+              m.labels = oldlabels
+            end
             num += 1 if index.update_message m, source, offset
           end
         else