Backporting various fixes and improvements from the trunk.

1 files changed, 33 insertions, 19 deletions

diff --git a/bin/genaliases b/bin/genaliases
index 289c5bec..bda43ef5 100644
--- a/bin/genaliases
+++ b/bin/genaliases
@@ -1,37 +1,40 @@
 #! @PYTHON@
 #
-# Copyright (C) 2001,2002 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2003 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
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software 
+# along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-"""Regenerate Postfix's data/aliases and data/aliases.db files from scratch.
+"""Regenerate Mailman specific aliases from scratch.
 
-Usage:
-
-    genaliases [options]
+The actual output depends on the value of the `MTA' variable in your mm_cfg.py
+file.
 
+Usage: genaliases [options]
 Options:
 
+    -q/--quiet
+        Some MTA output can include more verbose help text.  Use this to tone
+        down the verbosity.
+
     -h/--help
         Print this message and exit.
 """
 
-import sys
 import os
+import sys
 import getopt
-import fcntl
 
 import paths                                      # path hacking
 from Mailman import mm_cfg
@@ -39,6 +42,12 @@ from Mailman import Utils
 from Mailman import MailList
 from Mailman.i18n import _
 
+try:
+    True, False
+except NameError:
+    True = 1
+    False = 0
+
 
 
 def usage(code, msg=''):
@@ -54,32 +63,35 @@ def usage(code, msg=''):
 
 
 def main():
+    quiet = False
     try:
-        opts, args = getopt.getopt(sys.argv[1:], 'h', ['help'])
+        opts, args = getopt.getopt(sys.argv[1:], 'hq',
+                                   ['help', 'quiet'])
     except getopt.error, msg:
         usage(1, msg)
 
     for opt, arg in opts:
         if opt in ('-h', '--help'):
             usage(0)
+        elif opt in ('-q', '--quiet'):
+            quiet = True
 
     if args:
         usage(1)
 
-    # Open up the MTA specific module
+    # Import the MTA specific module
     modulename = 'Mailman.MTA.' + mm_cfg.MTA
     __import__(modulename)
     MTA = sys.modules[modulename]
 
-    # Open the text file and Berkeley DB files, truncating any data already
-    # there.  We need to acquire a lock so nobody tries to update the files
-    # while we're doing it.
+    # We need to acquire a lock so nobody tries to update the files while
+    # we're doing it.
     lock = MTA.makelock()
     lock.lock()
     # Group lists by virtual hostname
     mlists = {}
     for listname in Utils.list_names():
-        mlist = MailList.MailList(listname, lock=0)
+        mlist = MailList.MailList(listname, lock=False)
         mlists.setdefault(mlist.host_name, []).append(mlist)
     # Make sure the files are created rw-rw-xxx; it should be okay to be world
     # readable.
@@ -87,14 +99,16 @@ def main():
     try:
         MTA.clear()
         if not mlists:
-            MTA.create(None, nolock=1)
+            MTA.create(None, nolock=True, quiet=quiet)
         else:
             for hostname, vlists in mlists.items():
                 for mlist in vlists:
-                    MTA.create(mlist, nolock=1)
+                    MTA.create(mlist, nolock=True, quiet=quiet)
+                    # Be verbose for only the first printed list
+                    quiet = True
     finally:
         os.umask(omask)
-        lock.unlock(unconditionally=1)
+        lock.unlock(unconditionally=True)