From 18699b0cf227f9090f504e3092866c0718a44efc Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Tue, 17 Oct 2023 20:13:56 +0200 Subject: [PATCH] Fix breakage of supybot.directories.data.web when it's a relative directory (the default) --- src/conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf.py b/src/conf.py index 0a02ecaac..c29f04c87 100644 --- a/src/conf.py +++ b/src/conf.py @@ -954,7 +954,7 @@ class DataFilename(registry.String): def __call__(self): v = super(DataFilename, self).__call__() dataDir = supybot.directories.data() - if not v.startswith(dataDir): + if not v.startswith("/") and not v.startswith(dataDir): v = os.path.basename(v) v = os.path.join(dataDir, v) self.setValue(v) @@ -984,7 +984,7 @@ registerGlobalValue(supybot.directories.data, 'tmp', DataFilenameDirectory('tmp', _("""Determines what directory temporary files are put into."""))) registerGlobalValue(supybot.directories.data, 'web', - Directory('web', _("""Determines what directory files of the + DataFilenameDirectory('web', _("""Determines what directory files of the web server (templates, custom images, ...) are put into."""))) def _update_tmp():