Update of /cvsroot/mailman/mailman3/bin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12650
Modified Files:
mailmanctl
Log Message:
We're using configuration files now, not directories. Also we don't need to
do shutdown logic in the __main__ since we're using an atexit function.
Index: mailmanctl
===================================================================
RCS file: /cvsroot/mailman/mailman3/bin/mailmanctl,v
retrieving revision 3.3
retrieving revision 3.4
diff -u -d -r3.3 -r3.4
--- mailmanctl 21 Apr 2004 03:32:17 -0000 3.3
+++ mailmanctl 1 May 2004 03:58:40 -0000 3.4
@@ -1,6 +1,6 @@
#! /usr/bin/env python
-# Copyright (C) 2003 Barry A. Warsaw
+# Copyright (C) 2004 Barry A. Warsaw
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -297,8 +297,8 @@
print
print _('No command given')
sys.exit(1)
- # We must have a config directory. If one wasn't given, look for
- # ../mmconfig
+ # We must have a config file. If one wasn't given, look for
+ # ../etc/mailman.conf
if opts.configfile is None:
here = os.path.abspath(os.path.dirname(__file__))
parent = os.path.normpath(os.path.join(here, '..', 'etc'))
@@ -308,7 +308,7 @@
else:
parser.print_help()
print
- print _('No configuration directory found, please use -C')
+ print _('No configuration file found, please use -C')
sys.exit(1)
return opts, parser, args[0]
@@ -438,8 +438,5 @@
options, parser, command = parseargs()
configuration.configure(options.configfile)
if configuration.qrunner.enable:
- try:
- log = logging.getLogger('mailman.queues')
- main(command)
- finally:
- logging.shutdown()
+ log = logging.getLogger('mailman.queues')
+ main(command)
_______________________________________________
Mailman-checkins mailing list
[EMAIL PROTECTED]
Unsubscribe: http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
