Merge branch 'master' into next

[sup] / lib / sup / maildir.rb

diff --git a/lib/sup/maildir.rb b/lib/sup/maildir.rb
index 3661abbce40eb703c2314a37f6dd106e414ffd62..2c33e3bdc06b08f68b1d4b3caf564021eb6d71b8 100644 (file)
--- a/lib/sup/maildir.rb
+++ b/lib/sup/maildir.rb
@@ -9,6 +9,7 @@ module Redwood
 ## pathnames on disk.
 
 class Maildir < Source
+  include SerializeLabelsNicely
   SCAN_INTERVAL = 30 # seconds
   MYHOSTNAME = Socket.gethostname
 
@@ -212,7 +213,7 @@ private
 
   def maildir_data msg
     fn = File.basename @ids_to_fns[msg]
-    fn =~ %r{^([^:,]+):([12]),([DFPRST]*)$}
+    fn =~ %r{^([^:]+):([12]),([DFPRST]*)$}
     [($1 || fn), ($2 || "2"), ($3 || "")]
   end