From 2c6405edde515158bcbaafe0045edec1bbd2bfcd Mon Sep 17 00:00:00 2001 From: Griatch Date: Tue, 28 Jan 2020 21:23:13 +0100 Subject: [PATCH] Fix launcher error that caused problems when migrating non-sqlite databases --- evennia/server/evennia_launcher.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py index 1d6b1b4277..c3888ca184 100644 --- a/evennia/server/evennia_launcher.py +++ b/evennia/server/evennia_launcher.py @@ -27,6 +27,7 @@ from twisted.protocols import amp from twisted.internet import reactor, endpoints import django from django.core.management import execute_from_command_line +from django.db.utils import ProgrammingError # Signal processing SIG = signal.SIGINT @@ -1454,7 +1455,7 @@ def check_database(always_return=False): try: AccountDB.objects.get(id=1) - except django.db.utils.OperationalError as e: + except (django.db.utils.OperationalError, ProgrammingError) as e: if always_return: return False print(ERROR_DATABASE.format(traceback=e))