summaryrefslogtreecommitdiff
path: root/src/mailman/core/initialize.py
diff options
context:
space:
mode:
authorBarry Warsaw2013-03-20 12:49:29 -0700
committerBarry Warsaw2013-03-20 12:49:29 -0700
commit5110a2631f9ea6571db8a6b931076a7def7b9cf8 (patch)
tree397235acb8fb403646e14229c0a750af296b25de /src/mailman/core/initialize.py
parente8a082647854b45448435123918816acc375115a (diff)
downloadmailman-5110a2631f9ea6571db8a6b931076a7def7b9cf8.tar.gz
mailman-5110a2631f9ea6571db8a6b931076a7def7b9cf8.tar.zst
mailman-5110a2631f9ea6571db8a6b931076a7def7b9cf8.zip
Diffstat (limited to 'src/mailman/core/initialize.py')
-rw-r--r--src/mailman/core/initialize.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/mailman/core/initialize.py b/src/mailman/core/initialize.py
index 4c02df53a..2e5a4238f 100644
--- a/src/mailman/core/initialize.py
+++ b/src/mailman/core/initialize.py
@@ -68,7 +68,13 @@ def search_for_configuration_file():
# ./mailman.cfg
config_path = os.path.abspath('mailman.cfg')
if os.path.exists(config_path):
- return os.path.abspath(config_path)
+ return config_path
+ # As a special case, look in ./var/etc/mailman.cfg. We can't do this in
+ # the Configuration.load() method because that depends on the
+ # configuration system, which of course is not set up at that time!
+ config_path = os.path.abspath(os.path.join('var', 'etc', 'mailman.cfg'))
+ if os.path.exists(config_path):
+ return config_path
# ~/.mailman.cfg
config_path = os.path.join(os.getenv('HOME'), '.mailman.cfg')
if os.path.exists(config_path):