/offlineimap/head: changeset 287

Alter handling of messages flagged for deletion -- no longer
automatically delete them if expunge is 0. In Maildir folder, we will
now ignore the T flag entirely, and just pass it back and forth with
IMAP.

diff --git a/offlineimap/head/offlineimap/folder/IMAP.py b/offlineimap/head/offlineimap/folder/IMAP.py
index e9451b488f2de765328699c51da1233d735c27a1..d2e518b1abde923f9c9a23492c88ca1531c0649c 100644 (file)
--- a/offlineimap/head/offlineimap/folder/IMAP.py
+++ b/offlineimap/head/offlineimap/folder/IMAP.py
@@ -89,9 +89,7 @@ class IMAPFolder(BaseFolder):
             else:
                 uid = long(options['UID'])
                 flags = imaputil.flagsimap2maildir(options['FLAGS'])
-                # Skip messages already flagged for deletion on the server.
-                if not 'T' in flags:
-                    self.messagelist[uid] = {'uid': uid, 'flags': flags}
+                self.messagelist[uid] = {'uid': uid, 'flags': flags}
 
     def getmessagelist(self):
         return self.messagelist

diff --git a/offlineimap/head/offlineimap/folder/Maildir.py b/offlineimap/head/offlineimap/folder/Maildir.py
index c45d59ef5e706d81ce7b232b49fb4108e07e2f67..6f2f5d7ab517f6e05f7c7050c75c63e41a17e814 100644 (file)
--- a/offlineimap/head/offlineimap/folder/Maildir.py
+++ b/offlineimap/head/offlineimap/folder/Maildir.py
@@ -116,17 +116,9 @@ class MaildirFolder(BaseFolder):
             if flagmatch:
                 flags = [x for x in flagmatch.group(1)]
             flags.sort()
-            if 'T' in flags:
-                # Message is marked for deletion; just delete it now.
-                # Otherwise, the T flag will be propogated to the IMAP
-                # server, and then expunged there, and then deleted here.
-                # Might as well just delete it now, to help make things
-                # more robust.
-                os.unlink(file)
-            else:
-                retval[uid] = {'uid': uid,
-                               'flags': flags,
-                               'filename': file}
+            retval[uid] = {'uid': uid,
+                           'flags': flags,
+                           'filename': file}
         return retval
 
     def cachemessagelist(self):