Fixed error in main script when using other database engine. Fixed #1166.
This commit is contained in:
parent
5c44a279fc
commit
19ccbd3b17
@ -15,6 +15,7 @@ Files:
|
||||
Other:
|
||||
- Fixed http status code when requesting a non-existing static page using
|
||||
Tordado web server.
|
||||
- Fixed error in main script when using other database engine.
|
||||
|
||||
|
||||
Version 1.5 (2013-11-25)
|
||||
|
@ -243,12 +243,13 @@ def syncdb(settings, args):
|
||||
ensure_settings(settings, args)
|
||||
# TODO: Check use of filesystem2unicode here.
|
||||
db_file = get_database_path_from_settings()
|
||||
db_dir = filesystem2unicode(os.path.dirname(db_file))
|
||||
if not os.path.exists(db_dir):
|
||||
os.makedirs(db_dir)
|
||||
if not os.path.exists(db_file):
|
||||
print('Clearing old search index...')
|
||||
execute_from_command_line(["", "clear_index", "--noinput"])
|
||||
if db_file is not None:
|
||||
db_dir = filesystem2unicode(os.path.dirname(db_file))
|
||||
if not os.path.exists(db_dir):
|
||||
os.makedirs(db_dir)
|
||||
if not os.path.exists(db_file):
|
||||
print('Clearing old search index...')
|
||||
execute_from_command_line(["", "clear_index", "--noinput"])
|
||||
execute_from_command_line(["", "syncdb", "--noinput"])
|
||||
return 0
|
||||
|
||||
|
@ -360,7 +360,7 @@ def get_database_path_from_settings():
|
||||
raise DatabaseInSettingsError("Default databases is not configured")
|
||||
database_path = default.get('NAME')
|
||||
if not database_path:
|
||||
raise DatabaseInSettingsError('No path specified for default database.')
|
||||
raise DatabaseInSettingsError('No path or name specified for default database.')
|
||||
if default.get('ENGINE') != 'django.db.backends.sqlite3':
|
||||
database_path = None
|
||||
return database_path
|
||||
|
Loading…
Reference in New Issue
Block a user