simplify things

This commit is contained in:
Filip Valder
2016-11-25 18:56:55 +01:00
parent 1377797b28
commit 3eb152f7d6

View File

@@ -29,11 +29,8 @@ from os import sys
from module_build_service import logger
imp.load_source('mbs_runtime_config', '/etc/module-build-service/config.py')
DevConfiguration = mbs_runtime_config.DevConfiguration
TestConfiguration = mbs_runtime_config.TestConfiguration
ProdConfiguration = mbs_runtime_config.ProdConfiguration
mbs_runtime_config = imp.load_source('mbs_runtime_config',
'/etc/module-build-service/config.py')
def init_config(app):
@@ -47,11 +44,11 @@ def _init_app_config(app):
app.config.from_envvar("MBS_SETTINGS", silent=True)
here = sys.path[0]
if any(['nosetests' in arg for arg in sys.argv]):
app.config.from_object('TestConfiguration')
app.config.from_object('mbs_runtime_config.TestConfiguration')
elif here not in ('/usr/bin', '/bin', '/usr/local/bin'):
app.config.from_object('DevConfiguration')
app.config.from_object('mbs_runtime_config.DevConfiguration')
else:
app.config.from_object('ProdConfiguration')
app.config.from_object('mbs_runtime_config.ProdConfiguration')
class Config(object):