From fa9beb742829d60746093d7b4d9b73c941bc7cd0 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Thu, 17 Jan 2019 08:28:20 +0100
Subject: [PATCH] [build] Fix printout
---
bob/devtools/build.py | 4 ++--
bob/devtools/scripts/build.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/bob/devtools/build.py b/bob/devtools/build.py
index ee5fa7c6..9e8f5ff2 100644
--- a/bob/devtools/build.py
+++ b/bob/devtools/build.py
@@ -316,8 +316,8 @@ if __name__ == '__main__':
channels = bootstrap.get_channels(
public=(os.environ['CI_PROJECT_VISIBILITY']=='public'),
stable=(not is_prerelease), server=bootstrap._SERVER, intranet=True)
- logger.info('Using the following channels during build:%s',
- '\n - '.join(channels))
+ logger.info('Using the following channels during build:\n - %s',
+ '\n - '.join(channels + ['defaults']))
condarc_options['channels'] = channels + ['defaults']
conda_config = make_conda_config(conda_build_config, pyver, recipe_append,
diff --git a/bob/devtools/scripts/build.py b/bob/devtools/scripts/build.py
index b1075d8f..e8208504 100644
--- a/bob/devtools/scripts/build.py
+++ b/bob/devtools/scripts/build.py
@@ -100,8 +100,8 @@ def build(recipe_dir, python, condarc, config, no_test, append_file,
else:
# use default and add channels
condarc_options = yaml.load(BASE_CONDARC) #n.b.: no channels
- logger.info('Using the following channels during build:%s',
- '\n - '.join(channels))
+ logger.info('Using the following channels during build:\n - %s',
+ '\n - '.join(channels + ['defaults']))
condarc_options['channels'] = channels + ['defaults']
conda_config = make_conda_config(config, python, append_file, condarc_options)
--
GitLab