Skip to content

Commit bb35229

Browse files
author
Roche Compaan
committed
Oops.
1 parent efb37f1 commit bb35229

File tree

1 file changed

+13
-10
lines changed

1 file changed

+13
-10
lines changed

roundup/mailgw.py

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class node. Any parts of other types are each stored in separate files
7373
an exception, the original message is bounced back to the sender with the
7474
explanatory message given in the exception.
7575
76-
$Id: mailgw.py,v 1.42 2001-12-15 19:24:39 rochecompaan Exp $
76+
$Id: mailgw.py,v 1.43 2001-12-15 19:39:01 rochecompaan Exp $
7777
'''
7878

7979

@@ -623,24 +623,27 @@ def parseContent(content, blank_line=re.compile(r'[\r\n]+\s*[\r\n]+'),
623623
if not section:
624624
continue
625625
lines = eol.split(section)
626+
if lines[0] and lines[0][0] in '>|':
627+
continue
628+
if len(lines) > 1 and lines[1] and lines[1][0] in '>|':
629+
continue
626630
if not summary:
627631
summary = lines[0]
628632
l.append(section)
629633
continue
630-
# TODO: write better pattern for matching signature - it
631-
# currently truncates messages with dashes in
632-
#if signature.match(lines[0]):
633-
# break
634+
if signature.match(lines[0]):
635+
break
634636
l.append(section)
635637
return summary, '\n\n'.join(l)
636638

637639
#
638640
# $Log: not supported by cvs2svn $
639-
# Revision 1.27 2001/12/15 06:51:04 roche
640-
# Merge with CVS
641-
#
642-
# Revision 1.1.1.11 2001/12/13 07:05:43 roche
643-
# update from cvs
641+
# Revision 1.42 2001/12/15 19:24:39 rochecompaan
642+
# . Modified cgi interface to change properties only once all changes are
643+
# collected, files created and messages generated.
644+
# . Moved generation of change note to nosyreactors.
645+
# . We now check for changes to "assignedto" to ensure it's added to the
646+
# nosy list.
644647
#
645648
# Revision 1.41 2001/12/10 00:57:38 richard
646649
# From CHANGES:

0 commit comments

Comments
 (0)