OwlBurst/Ponysearch
1
0
Fork 0
forked from Ponysearch/Ponysearch
Code Pull requests Activity

[fix] buildenv: first unset environment / then import searx package

Browse source 
The first import of names from the searx package implies loading the
settings.yml.  Before this is done, the enviroment variables must be unset to
not overwrite the values from the settings.yml

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
This commit is contained in:
Markus Heiser 2021-07-30 08:10:02 +02:00 committed by Alexandre Flament
parent 4b43775c91
commit 64d64535a2
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
utils/build_env.py
View file

@ -7,15 +7,12 @@ import sys
import os import os
from os.path import realpath, dirname, join, sep, abspath from os.path import realpath, dirname, join, sep, abspath
from searx.version import GIT_URL, GIT_BRANCH
repo_root = realpath(dirname(realpath(__file__)) + sep + '..') repo_root = realpath(dirname(realpath(__file__)) + sep + '..')
sys.path.insert(0, repo_root) sys.path.insert(0, repo_root)
# Under the assumption that a brand is always a fork assure that the settings # Assure that the settings file from reposetorie's working tree is used to
# file from reposetorie's working tree is used to generate the build_env, not # generate the build_env, not from /etc/searx/settings.yml.
# from /etc/searx/settings.yml. os.environ['SEARX_SETTINGS_PATH'] = join(repo_root, 'etc', 'settings.yml')
os.environ['SEARX_SETTINGS_PATH'] = abspath(dirname(__file__) + sep + 'settings.yml')
def _env(*arg, **kwargs): def _env(*arg, **kwargs):
val = get_setting(*arg, **kwargs) val = get_setting(*arg, **kwargs)
@ -49,9 +46,10 @@ for name, option in name_val:
if not os.environ.get(name, _unset) is _unset: if not os.environ.get(name, _unset) is _unset:
del os.environ[name] del os.environ[name]
# After the variables are unset in the environ, we can import settings # After the variables are unset in the environ, we can import from the searx
# (get_setting) from searx module. # package (what will read the values from the settings.yml).
from searx.version import GIT_URL, GIT_BRANCH
from searx import get_setting from searx import get_setting
print('build %s (settings from: %s)' % (brand_env, os.environ['SEARX_SETTINGS_PATH'])) print('build %s (settings from: %s)' % (brand_env, os.environ['SEARX_SETTINGS_PATH']))