From a31cb68668f2c5b890dc973aeeb90ef2246099aa Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Mon, 11 Jan 2021 22:56:15 +0100 Subject: [PATCH] [fix] utils/build_env.py: make sure to always use searx/settings.yml ignore SEARX_SETTINGS_PATH [1] https://github.com/searx/searx/pull/2408#pullrequestreview-565247895 Suggested-by: @dalf [1] Signed-off-by: Markus Heiser --- utils/build_env.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/utils/build_env.py b/utils/build_env.py index e7077dec..b99e457c 100644 --- a/utils/build_env.py +++ b/utils/build_env.py @@ -4,10 +4,17 @@ # set path import sys -from os.path import realpath, dirname, join, sep +import os +from os.path import realpath, dirname, join, sep, abspath + repo_root = realpath(dirname(realpath(__file__)) + sep + '..') sys.path.insert(0, repo_root) +# Under the assumption that a brand is always a fork assure that the settings +# file from reposetorie's working tree is used to generate the build_env, not +# from /etc/searx/settings.yml. +os.environ['SEARX_SETTINGS_PATH'] = abspath(dirname(__file__) + sep + 'settings.yml') + from searx import brand name_val = [