mirror
/
archivemail
mirror of https://git.code.sf.net/p/archivemail/code
1
0
Fork 0
Code Issues Releases Wiki Activity

When converting from maildir or IMAP to mbox, report existing 'Status' and 

'X-Status' headers in verbose mode, since they are preserved, which can give
surprising results.
This commit is contained in:
Nikolaus Schulz 2007-11-02 12:27:32 +00:00
parent 82e3be1987
commit 130a5ef117
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
archivemail.py
View File

@ -846,10 +846,16 @@ def add_status_headers(message):
# Maildir messages should not already have 'Status' and 'X-Status'
# headers, although I have seen it done. If they do already have them, just
# preserve them rather than trying to overwrite/verify them.
if not message.get('Status') and status:
old_status = message.get('Status')
if old_status:
vprint("preserving existing Status header '%s'" % old_status)
elif status:
vprint("converting maildir status into Status header '%s'" % status)
message['Status'] = status
if not message.get('X-Status') and x_status:
old_x_status = message.get('X-Status')
if old_x_status:
vprint("preserving existing X-Status header '%s'" % old_x_status)
elif x_status:
vprint("converting maildir status into X-Status header '%s'" % x_status)
message['X-Status'] = x_status
@ -876,10 +882,16 @@ def add_status_headers_imap(message, flags):
# As with maildir folders, preserve Status and X-Status headers
# if they exist (they shouldn't)
if not message.get('Status') and status:
old_status = message.get('Status')
if old_status:
vprint("preserving existing Status header '%s'" % old_status)
elif status:
vprint("converting imap status into Status header '%s'" % status)
message['Status'] = status
if not message.get('X-Status') and x_status:
old_x_status = message.get('X-Status')
if old_x_status:
vprint("preserving existing X-Status header '%s'" % old_x_status)
elif x_status:
vprint("converting imap status into X-Status header '%s'" % x_status)
message['X-Status'] = x_status