aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman/MTA
diff options
context:
space:
mode:
authorMark Sapiro <msapiro@value.net>2011-04-16 09:40:26 -0700
committerMark Sapiro <msapiro@value.net>2011-04-16 09:40:26 -0700
commite45a9c8bed898479b44326d09efc5a22bf42f2c5 (patch)
tree45a14859067787eb8d0b5c92b6751f91b6ff0cc0 /Mailman/MTA
parentfa589b5e9dfaa1a90255dff2448e4998353ce389 (diff)
downloadmailman2-e45a9c8bed898479b44326d09efc5a22bf42f2c5.tar.gz
mailman2-e45a9c8bed898479b44326d09efc5a22bf42f2c5.tar.xz
mailman2-e45a9c8bed898479b44326d09efc5a22bf42f2c5.zip
Changed bin/genaliases to only call the POSTFIX_*_CMD commands once when
MTA = 'Postfix'. Bug #266408.
Diffstat (limited to 'Mailman/MTA')
-rw-r--r--Mailman/MTA/Postfix.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/Mailman/MTA/Postfix.py b/Mailman/MTA/Postfix.py
index 0fcf0526..801ddc0f 100644
--- a/Mailman/MTA/Postfix.py
+++ b/Mailman/MTA/Postfix.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2008 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2011 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
@@ -235,7 +235,10 @@ def create(mlist, cgi=False, nolock=False, quiet=False):
_do_create(mlist, ALIASFILE, _addlist)
if mlist and mlist.host_name in mm_cfg.POSTFIX_STYLE_VIRTUAL_DOMAINS:
_do_create(mlist, VIRTFILE, _addvirtual)
- _update_maps()
+ # bin/genaliases is the only one that calls create with nolock = True.
+ # Use that to only update the maps at the end of genaliases.
+ if not nolock:
+ _update_maps()
finally:
if lock:
lock.unlock(unconditionally=True)