summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2014-08-09 21:10:54 -0300
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2014-08-09 21:10:54 -0300
commit14a9085652dec1bbdfb86e689f3dc7b78d374fa3 (patch)
tree34a146ba4f0194ef5e442b5ba0c3edee36764bbc
parent26889b071a0196312947ead2b80f9a941deb13c0 (diff)
parent3db8d3e8624102844b05fb175e7e9b413f21262e (diff)
downloadaskbot-14a9085652dec1bbdfb86e689f3dc7b78d374fa3.tar.gz
askbot-14a9085652dec1bbdfb86e689f3dc7b78d374fa3.tar.bz2
askbot-14a9085652dec1bbdfb86e689f3dc7b78d374fa3.zip
Merge pull request #103 from rukeba/patch-1
askbot-setup: Accepting 'database_name' for sqlite engine from cmd line argument
-rw-r--r--askbot/deployment/__init__.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/askbot/deployment/__init__.py b/askbot/deployment/__init__.py
index 0dbe58c6..b10a6474 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'