aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Garrett <dylan.garrett@gmail.com>2021-06-09 22:27:21 -0700
committerDylan Garrett <dylan.garrett@gmail.com>2021-06-09 22:27:21 -0700
commit3a2c067bd6790f9c10d7cf3f82cee7aa46777681 (patch)
tree2f19c3c152194fad787ae3f3da861a5c9807977e
parent1ada218538511fa1e1fd982133a928aa589647bb (diff)
downloadroka-3a2c067bd6790f9c10d7cf3f82cee7aa46777681.tar.gz
roka-3a2c067bd6790f9c10d7cf3f82cee7aa46777681.zip
Always load one or the other config
-rwxr-xr-xroka.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/roka.py b/roka.py
index 4bb86fb..9ac88d1 100755
--- a/roka.py
+++ b/roka.py
@@ -114,7 +114,7 @@ if __name__ == '__main__':
self.__dict__ = d
config = objectview(json.loads(args.config))
app.config.from_object(config)
- elif os.path.exists(os.path.join(abs_path, 'app.cfg')):
+ else:
app.config.from_pyfile(os.path.join(abs_path, 'app.cfg'))
root_path = os.path.expanduser(app.config['ROOT_PATH'])