diff options
| author | Barry Warsaw | 2012-03-12 22:27:19 -0700 |
|---|---|---|
| committer | Barry Warsaw | 2012-03-12 22:27:19 -0700 |
| commit | 07685642934fe934098927a9a9d20c17080f3dab (patch) | |
| tree | 0984a6c339043e6dad7903e82c4b14aa674e005d /src | |
| parent | 2f353ca44106cd1e0d7fe40d6d2c230d1898adf3 (diff) | |
| parent | 59084018c332a2979f65531007c58b72745ef617 (diff) | |
| download | mailman-07685642934fe934098927a9a9d20c17080f3dab.tar.gz mailman-07685642934fe934098927a9a9d20c17080f3dab.tar.zst mailman-07685642934fe934098927a9a9d20c17080f3dab.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/mailman/bin/mailman.py | 6 | ||||
| -rw-r--r-- | src/mailman/docs/NEWS.rst | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/mailman/bin/mailman.py b/src/mailman/bin/mailman.py index 2a230b49f..94de65255 100644 --- a/src/mailman/bin/mailman.py +++ b/src/mailman/bin/mailman.py @@ -17,7 +17,7 @@ """The 'mailman' command dispatcher.""" -from __future__ import absolute_import, unicode_literals +from __future__ import absolute_import, print_function, unicode_literals __metaclass__ = type __all__ = [ @@ -94,7 +94,9 @@ def main(): # Mailman system, and in particular, we must read the configuration file. config_file = os.getenv('MAILMAN_CONFIG_FILE') if config_file is None: - config_file = args.config + if args.config is not None: + config_file = os.path.abspath(os.path.expanduser(args.config)) + initialize(config_file) # Perform the subcommand option. args.func(args) diff --git a/src/mailman/docs/NEWS.rst b/src/mailman/docs/NEWS.rst index ec9d531c1..b065c0ce3 100644 --- a/src/mailman/docs/NEWS.rst +++ b/src/mailman/docs/NEWS.rst @@ -91,6 +91,8 @@ Commands * Added a `help` email command. * A welcome message is sent when the user confirms their subscription via email. + * Global ``-C`` option now accepts an absolute path to the configuration + file. Given by Andrea Crotti. (LP: #953707) Bug fixes --------- |