From 73b321cc7154c262356acf59a042b7a35ab1adc4 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Thu, 17 Jan 2019 16:13:24 +0100
Subject: [PATCH] [bdt] Set LC_ALL and LANG before we parse the click cmdline
opts
---
bob/devtools/scripts/bdt.py | 7 ++++++-
bob/devtools/scripts/build.py | 2 --
bob/devtools/scripts/ci.py | 2 --
bob/devtools/scripts/create.py | 2 --
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/bob/devtools/scripts/bdt.py b/bob/devtools/scripts/bdt.py
index 14784527..92d3af40 100644
--- a/bob/devtools/scripts/bdt.py
+++ b/bob/devtools/scripts/bdt.py
@@ -11,6 +11,7 @@ import click
from click_plugins import with_plugins
from ..log import setup
+from ..bootstrap import set_environment
logger = setup('bob')
@@ -48,6 +49,11 @@ def raise_on_error(view_func):
return wraps(view_func)(_decorator)
+# must set LANG and LC_ALL before using click
+set_environment('LANG', 'en_US.UTF-8', os.environ, verbose=False)
+set_environment('LC_ALL', os.environ['LANG'], os.environ, verbose=False)
+
+
@with_plugins(pkg_resources.iter_entry_points('bdt.cli'))
@click.group(cls=AliasedGroup,
context_settings=dict(help_option_names=['-?', '-h', '--help']))
@@ -56,7 +62,6 @@ def main():
#sets up basic environment variables required everywhere
from ..constants import CACERT
- from ..bootstrap import set_environment
set_environment('SSL_CERT_FILE', CACERT, os.environ)
set_environment('REQUESTS_CA_BUNDLE', CACERT, os.environ)
diff --git a/bob/devtools/scripts/build.py b/bob/devtools/scripts/build.py
index 6e7f2038..79de7662 100644
--- a/bob/devtools/scripts/build.py
+++ b/bob/devtools/scripts/build.py
@@ -108,8 +108,6 @@ def build(recipe_dir, python, condarc, config, no_test, append_file,
conda_config = make_conda_config(config, python, append_file, condarc_options)
- set_environment('LANG', 'en_US.UTF-8', verbose=True)
- set_environment('LC_ALL', os.environ['LANG'], verbose=True)
set_environment('MATPLOTLIBRC', MATPLOTLIB_RCDIR, verbose=True)
# setup BOB_DOCUMENTATION_SERVER environment variable (used for bob.extension
diff --git a/bob/devtools/scripts/ci.py b/bob/devtools/scripts/ci.py
index 7d35fc7e..c85a0baf 100644
--- a/bob/devtools/scripts/ci.py
+++ b/bob/devtools/scripts/ci.py
@@ -246,8 +246,6 @@ def build(dry_run):
pyver = os.environ['PYTHON_VERSION']
logger.info('os.environ["%s"] = %s', 'PYTHON_VERSION', pyver)
- set_environment('LANG', 'en_US.UTF-8', os.environ, verbose=True)
- set_environment('LC_ALL', os.environ['LANG'], os.environ, verbose=True)
set_environment('MATPLOTLIBRC', MATPLOTLIB_RCDIR, verbose=True)
# get information about the version of the package being built
diff --git a/bob/devtools/scripts/create.py b/bob/devtools/scripts/create.py
index 57abe640..122e7ea6 100644
--- a/bob/devtools/scripts/create.py
+++ b/bob/devtools/scripts/create.py
@@ -122,8 +122,6 @@ def create(name, recipe_dir, python, overwrite, condarc, use_local, config,
# set some environment variables before continuing
set_environment('DOCSERVER', server, os.environ)
- set_environment('LANG', 'en_US.UTF-8', os.environ)
- set_environment('LC_ALL', os.environ['LANG'], os.environ)
if condarc is not None:
logger.info('Loading CONDARC file from %s...', condarc)
--
GitLab