From 325df8b4dd49b317b44389d145b17ff538a1003c Mon Sep 17 00:00:00 2001 From: genjix Date: Wed, 4 Apr 2012 11:58:14 +0100 Subject: [PATCH] load /etc/electrum.conf first, then ./electrum.conf (takes high precedence over /etc) --- server.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server.py b/server.py index dc551ed..71878cd 100755 --- a/server.py +++ b/server.py @@ -23,7 +23,7 @@ def attempt_read_config(config, filename): with open(filename, 'r') as f: config.readfp(f) except IOError: - print "Could not read %s. Falling back." % filename + pass def create_config(): config = ConfigParser.ConfigParser() @@ -42,7 +42,7 @@ def create_config(): config.set('database', 'database', 'abe') config.set('server', 'backend', 'abe') - for path in ('', '/etc/'): + for path in ('/etc/', ''): filename = path + 'electrum.conf' attempt_read_config(config, filename) -- 1.7.1