The next generation branch has been added

This commit is contained in:
2014-11-12 20:41:29 -06:00
parent 75f494fc5a
commit f54d9394b7
96 changed files with 2629 additions and 4517 deletions

View File

@@ -2,15 +2,14 @@
from config_utils import Configuration, ConfigurationResetException
import paths
MAINFILE = "session.conf"
MAINSPEC = "Conf.defaults"
MAINFILE = "twblue.conf"
MAINSPEC = "app-configuration.defaults"
main = None
app = None
def setup ():
global main
global app
try:
main = Configuration(paths.config_path(MAINFILE), paths.app_path(MAINSPEC))
app = Configuration(paths.config_path(MAINFILE), paths.app_path(MAINSPEC))
except ConfigurationResetException:
pass
# return main