diff options
| author | viega | 1998-05-30 04:18:52 +0000 |
|---|---|---|
| committer | viega | 1998-05-30 04:18:52 +0000 |
| commit | 76d4712f751814c2d3457477608636970079c2eb (patch) | |
| tree | 8ec227a72255f6eea704c979f7832c7da70ae126 | |
| parent | e606132f1b71ab64f56230cde988115ff6e39160 (diff) | |
| download | mailman-76d4712f751814c2d3457477608636970079c2eb.tar.gz mailman-76d4712f751814c2d3457477608636970079c2eb.tar.zst mailman-76d4712f751814c2d3457477608636970079c2eb.zip | |
Hmm, I didn't think I touched mm_pending since the last checkin. I
dunno what changed there. In mm_mailcmd, I fixed a bug w/ Scott's
code, so that if a reply comes back with no body, the confirm still
works. I don't know why he was checking the body and not just the
header for the pattern, but I left that check in there in case he
had a good reason.
| -rw-r--r-- | Mailman/MailCommandHandler.py | 6 | ||||
| -rw-r--r-- | modules/mm_mailcmd.py | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Mailman/MailCommandHandler.py b/Mailman/MailCommandHandler.py index 23efcd97d..232a4e95b 100644 --- a/Mailman/MailCommandHandler.py +++ b/Mailman/MailCommandHandler.py @@ -17,7 +17,7 @@ """Process maillist user commands arriving via email.""" -__version__ = "$Revision: 621 $" +__version__ = "$Revision: 632 $" # Try to stay close to majordomo commands, but accept common mistakes. # Not implemented: get / index / which. @@ -105,7 +105,9 @@ class MailCommandHandler: # conf_pat = r"%s -- confirmation of subscription -- request (\d\d\d\d\d\d)" % \ self.real_name - match = re.search(conf_pat, mail.body) + match = re.search(conf_pat, subject) + if not match: + match = re.search(conf_pat, mail.body) if match: lines = ["confirm %s" % (match.group(1))] else: diff --git a/modules/mm_mailcmd.py b/modules/mm_mailcmd.py index 23efcd97d..232a4e95b 100644 --- a/modules/mm_mailcmd.py +++ b/modules/mm_mailcmd.py @@ -17,7 +17,7 @@ """Process maillist user commands arriving via email.""" -__version__ = "$Revision: 621 $" +__version__ = "$Revision: 632 $" # Try to stay close to majordomo commands, but accept common mistakes. # Not implemented: get / index / which. @@ -105,7 +105,9 @@ class MailCommandHandler: # conf_pat = r"%s -- confirmation of subscription -- request (\d\d\d\d\d\d)" % \ self.real_name - match = re.search(conf_pat, mail.body) + match = re.search(conf_pat, subject) + if not match: + match = re.search(conf_pat, mail.body) if match: lines = ["confirm %s" % (match.group(1))] else: |