Mercurial > kallithea
changeset 2651:957329c1c35b beta
implements #507 setup-rhodecode always presents interactive prompt to destroy database, now -q flag fixes that
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Sat, 21 Jul 2012 23:25:26 +0200 |
| parents | 33252b42d9eb |
| children | 532ee86cf9b1 |
| files | rhodecode/lib/db_manage.py rhodecode/websetup.py |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/lib/db_manage.py Sat Jul 21 14:50:14 2012 +0200 +++ b/rhodecode/lib/db_manage.py Sat Jul 21 23:25:26 2012 +0200 @@ -61,13 +61,13 @@ 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]')
--- a/rhodecode/websetup.py Sat Jul 21 14:50:14 2012 +0200 +++ b/rhodecode/websetup.py Sat Jul 21 23:25:26 2012 +0200 @@ -38,7 +38,7 @@ 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)