/offlineimap/head: changeset 583

Reverted patch from Daniel James and updated Changelog.
This commit is contained in:
jgoerzen 2004-06-15 15:43:14 +01:00
parent 98e35afd42
commit 35c7b66862
3 changed files with 52 additions and 13 deletions

View File

@ -1,4 +1,38 @@
------------------------------------------------------------------------
r582 | jgoerzen | 2004-06-04 11:04:29 -0500 (Fri, 04 Jun 2004) | 1 line
Changed paths:
M /offlineimap/head/COPYRIGHT
M /offlineimap/head/debian/changelog
M /offlineimap/head/debian/copyright
M /offlineimap/head/offlineimap/version.py
Updated copyright info
------------------------------------------------------------------------
r581 | jgoerzen | 2004-06-04 10:50:57 -0500 (Fri, 04 Jun 2004) | 1 line
Changed paths:
M /offlineimap/head/debian/changelog
M /offlineimap/head/debian/rules
M /offlineimap/head/offlineimap/version.py
Use dh_python
------------------------------------------------------------------------
r580 | jgoerzen | 2004-06-04 10:47:21 -0500 (Fri, 04 Jun 2004) | 1 line
Changed paths:
M /offlineimap/head/Makefile
M /offlineimap/head/debian/changelog
M /offlineimap/head/debian/control
M /offlineimap/head/debian/rules
M /offlineimap/head/offlineimap/version.py
Final changes before 4.0.3
------------------------------------------------------------------------
r579 | jgoerzen | 2004-06-04 10:42:52 -0500 (Fri, 04 Jun 2004) | 1 line
Changed paths:
M /offlineimap/head/ChangeLog
M /offlineimap/head/Makefile
Preparing 4.0.3
------------------------------------------------------------------------
r578 | jgoerzen | 2004-06-04 10:29:24 -0500 (Fri, 04 Jun 2004) | 2 lines
Changed paths:
M /offlineimap/head/debian/changelog

View File

@ -1,3 +1,10 @@
offlineimap (4.0.4) unstable; urgency=low
* Reverted patch from Daniel James. It apparently has caused
header corruption. Closes: #254261.
-- John Goerzen <jgoerzen@complete.org> Tue, 15 Jun 2004 04:41:36 -0500
offlineimap (4.0.3) unstable; urgency=low
* Fixed version numbers to read 4.0.3. Closes: #220536.

View File

@ -126,22 +126,20 @@ class IMAPFolder(BaseFolder):
ui.debug('imap',
'savemessage_addheader: called to add %s: %s' % (headername,
headervalue))
newline = "%s: %s" % (headername, headervalue)
ui.debug('imap', 'savemessage_addheader: newline = ' + repr(newline))
insertionpoint = content.find("\r\n")
ui.debug('imap', 'savemessage_addheader: insertionpoint = %d' % insertionpoint)
if insertionpoint == -1:
return newline + "\r\n" + content
elif insertionpoint == 0:
return newline + content
leader = content[0:insertionpoint]
ui.debug('imap', 'savemessage_addheader: leader = %s' % repr(leader))
if insertionpoint == 0 or insertionpoint == -1:
newline = ''
insertionpoint = 0
else:
leader = content[0:insertionpoint]
ui.debug('imap', 'savemessage_addheader: leader = %s' % repr(leader))
trailer = content[insertionpoint:]
ui.debug('imap', 'savemessage_addheader: trailer = ' + repr(trailer))
return leader + "\r\n" + newline + trailer
newline = "\r\n"
newline += "%s: %s" % (headername, headervalue)
ui.debug('imap', 'savemessage_addheader: newline = ' + repr(newline))
trailer = content[insertionpoint:]
ui.debug('imap', 'savemessage_addheader: trailer = ' + repr(trailer))
return leader + newline + trailer
def savemessage_searchforheader(self, imapobj, headername, headervalue):
if imapobj.untagged_responses.has_key('APPENDUID'):