From f22fe4decd9a70a2eb826ecdd14f9d1bb3b4e394 Mon Sep 17 00:00:00 2001
From: Nikolaus Schulz <microschulz@web.de>
Date: Fri, 30 Jul 2010 19:13:14 +0200
Subject: Detect and never archive IMAP server pseudo mbox messages

IMAP servers (Dovecot and UW-IMAP at least) may store mailbox meta data for
mboxes in a pseudo message.  Such messages are now detected and never archived.

This commit includes a test case in the test suite.
---
 archivemail | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'archivemail')

diff --git a/archivemail b/archivemail
index ec05171..52ec06b 100755
--- a/archivemail
+++ b/archivemail
@@ -1156,6 +1156,12 @@ def _archive_mbox(mailbox_name, final_archive_name):
     msg = original.next()
     if not msg and (original.starting_size > 0):
         user_error("'%s' is not a valid mbox-format mailbox" % mailbox_name)
+    if msg and 'X-IMAP' in msg:
+        # Dovecot and UW-IMAP pseudo message for mailbox meta data
+        vprint("detected IMAP pseudo message")
+        if retain:
+            retain.write(msg)
+        msg = original.next()
     while (msg):
         msg_size = sizeof_message(msg)
         stats.another_message(msg_size)
-- 
cgit v1.2.3