From e45a9c8bed898479b44326d09efc5a22bf42f2c5 Mon Sep 17 00:00:00 2001
From: Mark Sapiro <msapiro@value.net>
Date: Sat, 16 Apr 2011 09:40:26 -0700
Subject: Changed bin/genaliases to only call the POSTFIX_*_CMD commands once
 when MTA = 'Postfix'.  Bug #266408.

---
 Mailman/MTA/Postfix.py | 7 +++++--
 NEWS                   | 3 +++
 bin/genaliases         | 6 ++++--
 3 files changed, 12 insertions(+), 4 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)
diff --git a/NEWS b/NEWS
index db3039ae..3971b242 100644
--- a/NEWS
+++ b/NEWS
@@ -38,6 +38,9 @@ Here is a history of user visible changes to Mailman.
 
   Bug Fixes and other patches
 
+    - Changed bin/genaliases to only call the POSTFIX_*_CMD commands once when
+      MTA = 'Postfix'.  Bug #266408.
+
     - Added a report of the affected members to the warnings issued when
       setting a list with digest members digestable=No and when setting a list
       with non-digest members nondigestable=no.  Bug #761232.
diff --git a/bin/genaliases b/bin/genaliases
index 0a1a3dae..77bc2907 100644
--- a/bin/genaliases
+++ b/bin/genaliases
@@ -1,6 +1,6 @@
 #! @PYTHON@
 #
-# Copyright (C) 2001-2003 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
@@ -113,8 +113,10 @@ def main():
                     # Be verbose for only the first printed list
                     quiet = True
     finally:
-        os.umask(omask)
         lock.unlock(unconditionally=True)
+        # Postfix has not been updating the maps. This call will do it.
+        MTA.create(None, quiet=True)
+        os.umask(omask)
 
 
 
-- 
cgit v1.2.3