summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuslan Keba <rukeba@gmail.com>2012-12-05 17:03:44 +0200
committerRuslan Keba <rukeba@gmail.com>2012-12-05 17:03:44 +0200
commit3db8d3e8624102844b05fb175e7e9b413f21262e (patch)
tree7ffecff92526f4a4a1f91c681b899a131e296007
parent56a3187a88927e8eb1bdc1c48f3f230ec5e42580 (diff)
downloadaskbot-3db8d3e8624102844b05fb175e7e9b413f21262e.tar.gz
askbot-3db8d3e8624102844b05fb175e7e9b413f21262e.tar.bz2
askbot-3db8d3e8624102844b05fb175e7e9b413f21262e.zip
askbot-setup: Accepting 'database_name' for sqlite engine from cmd line arguments
-rw-r--r--askbot/deployment/__init__.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/askbot/deployment/__init__.py b/askbot/deployment/__init__.py
index 1ba5c202..1a73b563 100644
--- a/askbot/deployment/__init__.py
+++ b/askbot/deployment/__init__.py
@@ -202,6 +202,8 @@ def deploy_askbot(options):
def collect_missing_options(options_dict):
options_dict['secret_key'] = generate_random_key()
if options_dict['database_engine'] == '2':#sqlite
+ if 'database_name' in options_dict:
+ return options_dict
while True:
value = console.simple_dialog(
'Please enter database file name'
@@ -217,6 +219,8 @@ def collect_missing_options(options_dict):
print 'name %s cannot be used for the database name' % value
elif value == path_utils.LOG_DIR_NAME:
print 'name %s cannot be used for the database name' % value
+ else:
+ database_file_name = value
if database_file_name:
options_dict['database_name'] = database_file_name