From f0eb0a5bcab9ab98828e9a741cf41422114862e7 Mon Sep 17 00:00:00 2001 From: Lubomir Dolezal Date: Tue, 16 Apr 2024 10:23:20 +0200 Subject: [PATCH] fix: mapserver env set if old_value == 'None' can happen for rarely configured StorageAuths which have a string 'None' as a value --- eoxserver/contrib/mapserver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eoxserver/contrib/mapserver.py b/eoxserver/contrib/mapserver.py index 6a72d1f6d..94756c6a0 100644 --- a/eoxserver/contrib/mapserver.py +++ b/eoxserver/contrib/mapserver.py @@ -285,7 +285,7 @@ def set_env(map_obj, env, fail_on_override=False, return_old=False): if fail_on_override or return_old: old_value = map_obj.getConfigOption(str(key)) if fail_on_override and old_value is not None \ - and old_value != value: + and old_value != value and old_value != 'None': raise Exception( 'Would override previous value of %s: %s with %s' % (key, old_value, value)