------------------------------------------------------------
revno: 6730
committer: Barry Warsaw <[email protected]>
branch nick: 3.0
timestamp: Fri 2009-05-15 18:40:41 -0400
message:
Back out that last change in override order between the environment variable
and -C.
modified:
src/mailman/options.py
=== modified file 'src/mailman/options.py'
--- src/mailman/options.py 2009-05-15 22:37:29 +0000
+++ src/mailman/options.py 2009-05-15 22:40:41 +0000
@@ -137,8 +137,10 @@
from the configuration files.
:type propagate_logs: bool or None.
"""
- # The environment variable overrides the -C option.
- config_file = os.getenv('MAILMAN_CONFIG_FILE', self.options.config)
+ # Fall back to using the environment variable if -C is not given.
+ config_file = (os.getenv('MAILMAN_CONFIG_FILE')
+ if self.options.config is None
+ else self.options.config)
initialize(config_file, propagate_logs=propagate_logs)
self.sanity_check()
--
Primary development focus
https://code.launchpad.net/~mailman-coders/mailman/3.0
Your team Mailman Checkins is subscribed to branch lp:mailman.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/3.0/+edit-subscription.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
