Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix launcher error that caused problems when migrating non-sqlite databases

Browse source
This commit is contained in:
Griatch 2020-01-28 21:23:13 +01:00
parent ed92f9a177
commit 2c6405edde
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
evennia/server/evennia_launcher.py
View file

@ -27,6 +27,7 @@ from twisted.protocols import amp
from twisted.internet import reactor, endpoints from twisted.internet import reactor, endpoints
import django import django
from django.core.management import execute_from_command_line from django.core.management import execute_from_command_line
from django.db.utils import ProgrammingError
# Signal processing # Signal processing
SIG = signal.SIGINT SIG = signal.SIGINT
@ -1454,7 +1455,7 @@ def check_database(always_return=False):
try: try:
AccountDB.objects.get(id=1) AccountDB.objects.get(id=1)
except django.db.utils.OperationalError as e: except (django.db.utils.OperationalError, ProgrammingError) as e:
if always_return: if always_return:
return False return False
print(ERROR_DATABASE.format(traceback=e)) print(ERROR_DATABASE.format(traceback=e))