# HG changeset patch # User Marcin Kuzminski # Date 2012-07-21 21:25:26 # Node ID 957329c1c35bfe6526beeafc83abacfd7d03ad13 # Parent 33252b42d9eb4981bb04b799b01f72a9b4b7eb78 implements #507 setup-rhodecode always presents interactive prompt to destroy database, now -q flag fixes that diff --git a/rhodecode/lib/db_manage.py b/rhodecode/lib/db_manage.py --- a/rhodecode/lib/db_manage.py +++ b/rhodecode/lib/db_manage.py @@ -61,13 +61,13 @@ class DbManage(object): init_model(engine) self.sa = meta.Session - def create_tables(self, override=False): + def create_tables(self, override=False, defaults={}): """ Create a auth database """ - + quiet = defaults.get('quiet') log.info("Any existing database is going to be destroyed") - if self.tests: + if self.tests or quiet: destroy = True else: destroy = ask_ok('Are you sure to destroy old database ? [y/n]') diff --git a/rhodecode/websetup.py b/rhodecode/websetup.py --- a/rhodecode/websetup.py +++ b/rhodecode/websetup.py @@ -38,7 +38,7 @@ def setup_app(command, conf, vars): dbconf = conf['sqlalchemy.db1.url'] dbmanage = DbManage(log_sql=True, dbconf=dbconf, root=conf['here'], tests=False) - dbmanage.create_tables(override=True) + dbmanage.create_tables(override=True, defaults=command.options.__dict__) dbmanage.set_db_version() opts = dbmanage.config_prompt(None, defaults=command.options.__dict__) dbmanage.create_settings(opts)