From 378d1ccd1cbddde693daf2e578892edeeaf9755e Mon Sep 17 00:00:00 2001 From: Ruud Date: Fri, 12 Oct 2012 19:03:44 +0200 Subject: [PATCH] Check if db exists before loading plugins --- couchpotato/runner.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/couchpotato/runner.py b/couchpotato/runner.py index 31a8ce32..569ff57e 100644 --- a/couchpotato/runner.py +++ b/couchpotato/runner.py @@ -170,18 +170,17 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En log.warning('%s %s %s line:%s', (category, message, filename, lineno)) warnings.showwarning = customwarn + # Check if database exists + db = Env.get('db_path') + db_exists = os.path.isfile(db_path) # Load configs & plugins loader = Env.get('loader') loader.preload(root = base_path) loader.run() - # Load migrations - initialize = True - db = Env.get('db_path') - if os.path.isfile(db_path): - initialize = False + if db_exists: from migrate.versioning.api import version_control, db_version, version, upgrade repo = os.path.join(base_path, 'couchpotato', 'core', 'migration') @@ -201,7 +200,8 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En from couchpotato.core.settings.model import setup setup() - if initialize: + # Fill database with needed stuff + if not db_exists: fireEvent('app.initialize', in_order = True) # Create app