------------------------------------------------------------
revno: 1002
committer: Mark Sapiro <[EMAIL PROTECTED]>
branch nick: 2.2
timestamp: Fri 2008-08-22 14:57:22 -0700
message:
MTA/Postfix.py
If the STANZA END for a list being removed is missing or munged, the
remainder of the aliases and/or virtual-mailman file is lost. Fixed.
modified:
Mailman/MTA/Postfix.py
Mailman/Version.py
=== modified file 'Mailman/MTA/Postfix.py'
--- a/Mailman/MTA/Postfix.py 2005-12-30 18:50:08 +0000
+++ b/Mailman/MTA/Postfix.py 2008-08-22 21:57:22 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2005 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2008 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -256,6 +256,7 @@
filteroutp = False
start = '# STANZA START: ' + listname
end = '# STANZA END: ' + listname
+ oops = '# STANZA START: '
while 1:
line = infp.readline()
if not line:
@@ -270,6 +271,10 @@
# Discard the trailing blank line, but don't worry if
# we're at the end of the file.
infp.readline()
+ elif line.startswith(oops):
+ # Stanza end must be missing - start writing from here.
+ filteroutp = False
+ outfp.write(line)
# Otherwise, ignore the line
else:
if line.strip() == start:
=== modified file 'Mailman/Version.py'
--- a/Mailman/Version.py 2008-08-21 21:49:35 +0000
+++ b/Mailman/Version.py 2008-08-22 21:57:22 +0000
@@ -16,7 +16,7 @@
# USA.
# Mailman version
-VERSION = '2.2.0'
+VERSION = '2.2.0a0'
# And as a hex number in the manner of PY_VERSION_HEX
ALPHA = 0xa
--
Dormant development version (web u/i update)
https://code.launchpad.net/~mailman-coders/mailman/2.2
You are receiving this branch notification because you are subscribed to it.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
