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

Fix regressions in the evennia launcher shell and folder detection. Resolve #3749

Browse source
This commit is contained in:
Griatch 2025-03-21 23:27:38 +01:00
parent a685ffe55e
commit 441470991a
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
evennia/server/evennia_launcher.py
View file

@ -248,7 +248,7 @@ RECREATED_MISSING = """
ERROR_DATABASE = """ ERROR_DATABASE = """
ERROR: Your database does not exist or is not set up correctly. ERROR: Your database does not exist or is not set up correctly.
(error was '{traceback}') Missing tables: {missing_tables}
If you think your database should work, make sure you are running your If you think your database should work, make sure you are running your
commands from inside your game directory. If this error persists, run commands from inside your game directory. If this error persists, run
@ -1539,7 +1539,10 @@ def check_database(always_return=False):
) )
else: else:
if not always_return: if not always_return:
raise Exception(f"Unsupported database vendor: {connection.vendor}") raise Exception(
f"Unsupported database: {connection.vendor}"
"Evennia supports PostgreSQL, MySQL, and SQLite only."
)
return False return False
existing_tables = {row[0].lower() for row in cursor.fetchall()} existing_tables = {row[0].lower() for row in cursor.fetchall()}
@ -1552,7 +1555,7 @@ def check_database(always_return=False):
return False return False
raise Exception( raise Exception(
f"Database tables missing: {', '.join(missing_tables)}. " f"Database tables missing: {', '.join(missing_tables)}. "
"Did you remember to run migrations?" "\nDid you remember to run migrations?"
) )
else: else:
create_superuser() create_superuser()
@ -1791,7 +1794,7 @@ def init_game_directory(path, check_db=True, need_gamedir=True):
# Set the GAMEDIR path if not set already # Set the GAMEDIR path if not set already
## Declaring it global doesn't set the variable ## Declaring it global doesn't set the variable
## This check is needed for evennia --gamedir to work ## This check is needed for evennia --gamedir to work
if need_gamedir and 'GAMEDIR' not in globals(): if need_gamedir and "GAMEDIR" not in globals():
set_gamedir(path) set_gamedir(path)
# Add gamedir to python path # Add gamedir to python path
@ -1807,11 +1810,12 @@ def init_game_directory(path, check_db=True, need_gamedir=True):
else: else:
os.environ["DJANGO_SETTINGS_MODULE"] = SETTINGS_DOTPATH os.environ["DJANGO_SETTINGS_MODULE"] = SETTINGS_DOTPATH
# test existence of the settings module
try:
# required since django1.7 # required since django1.7
django.setup() django.setup()
# test existence of the settings module
try:
from django.conf import settings from django.conf import settings
except Exception as ex: except Exception as ex:
if not str(ex).startswith("No module named"): if not str(ex).startswith("No module named"):
@ -1824,6 +1828,7 @@ def init_game_directory(path, check_db=True, need_gamedir=True):
# this will both check the database and initialize the evennia dir. # this will both check the database and initialize the evennia dir.
if check_db: if check_db:
check_database() check_database()
evennia._init()
# if we don't have to check the game directory, return right away # if we don't have to check the game directory, return right away
if not need_gamedir: if not need_gamedir: