From: wmorgan <wmorgan@5c8cc53c-5e98-4d25-b20a-d8db53a31250>
Date: Sun, 28 Oct 2007 01:28:49 +0000 (+0000)
Subject: strip all spaces from message ids
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=d31f8a6db0ff26151d3fad00025c6f6b478f15b1;p=sup

strip all spaces from message ids

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

diff --git a/lib/sup/index.rb b/lib/sup/index.rb
index 6ff7e5a..0da441a 100644
--- a/lib/sup/index.rb
+++ b/lib/sup/index.rb
@@ -154,7 +154,7 @@ EOS
     docid, entry = load_entry_for_id m.id unless docid && entry
 
     raise "no source info for message #{m.id}" unless m.source && m.source_info
-    raise "trying to delete non-corresponding entry #{docid}" if docid && @index[docid][:message_id] != m.id
+    raise "trying to delete non-corresponding entry #{docid} with index message-id #{@index[docid][:message_id].inspect} and parameter message id #{m.id.inspect}" if docid && @index[docid][:message_id] != m.id
 
     source_id = 
       if m.source.is_a? Integer
diff --git a/lib/sup/message.rb b/lib/sup/message.rb
index 13a41aa..8614b3c 100644
--- a/lib/sup/message.rb
+++ b/lib/sup/message.rb
@@ -60,7 +60,7 @@ class Message
 
     @id = header["message-id"]
     if @id
-      id.gsub!(/^\s+|\s+$/, "")
+      id.gsub!(/\s+/, "")
     else
       @id = "sup-faked-" + Digest::MD5.hexdigest(raw_header)
       Redwood::log "faking message-id for message from #@from: #@id"