changeset 3671:658ccf9727ef beta

setup_rhodecode: fix --force-no - force_ask is tri-state Missed in 260a7a01b.
author Mads Kiilerich <madski@unity3d.com>
date Thu, 04 Apr 2013 16:51:38 +0200
parents c67132dc74b6
children 55585c86be83
files rhodecode/lib/db_manage.py
diffstat 1 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/lib/db_manage.py	Thu Apr 04 16:43:21 2013 +0200
+++ b/rhodecode/lib/db_manage.py	Thu Apr 04 16:51:38 2013 +0200
@@ -67,12 +67,11 @@
         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)