summaryrefslogtreecommitdiff
path: root/src/mailman/options.py
diff options
context:
space:
mode:
authorBarry Warsaw2009-05-15 18:40:41 -0400
committerBarry Warsaw2009-05-15 18:40:41 -0400
commit855d7188024f67570a946665f5ba19522fbdb48a (patch)
tree004af50f7e32f61645ffc801a6aef4642272aef9 /src/mailman/options.py
parentb63bf8546956f5b15d9d7d565bec42da8fffbf24 (diff)
downloadmailman-855d7188024f67570a946665f5ba19522fbdb48a.tar.gz
mailman-855d7188024f67570a946665f5ba19522fbdb48a.tar.zst
mailman-855d7188024f67570a946665f5ba19522fbdb48a.zip
Diffstat (limited to 'src/mailman/options.py')
-rw-r--r--src/mailman/options.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mailman/options.py b/src/mailman/options.py
index 85508501a..d18c78cea 100644
--- a/src/mailman/options.py
+++ b/src/mailman/options.py
@@ -137,8 +137,10 @@ class Options:
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()