aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMads Kiilerich <madski@unity3d.com>2013-04-04 16:51:38 +0200
committerMads Kiilerich <madski@unity3d.com>2013-04-04 16:51:38 +0200
commit620adab57f32afa7aee63b799b5d45a53eab47ff (patch)
treea089259b1595975ea45a2481c8c8406f82affeaa
parent9f44787a464c9e5b727b061b7dc0e4b8a89413cb (diff)
setup_rhodecode: fix --force-no - force_ask is tri-state
Missed in 260a7a01b. --HG-- branch : beta
-rw-r--r--rhodecode/lib/db_manage.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/rhodecode/lib/db_manage.py b/rhodecode/lib/db_manage.py
index 51c884ef..0b7bab52 100644
--- a/rhodecode/lib/db_manage.py
+++ b/rhodecode/lib/db_manage.py
@@ -67,12 +67,11 @@ class DbManage(object):
self.db_exists = False
self.cli_args = cli_args
self.init_db()
- global ask_ok
- if self.cli_args.get('force_ask'):
- ask_ok = lambda *args, **kwargs: True
- elif not self.cli_args.get('force_ask'):
- ask_ok = lambda *args, **kwargs: False
+ force_ask = self.cli_args.get('force_ask')
+ if force_ask is not None:
+ global ask_ok
+ ask_ok = lambda *args, **kwargs: force_ask
def init_db(self):
engine = create_engine(self.dburi, echo=self.log_sql)