From 81bf29b8caef4ad3ff0f76d6e58971b6474f69f4 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Wed, 1 Apr 2020 15:34:13 +0200 Subject: [PATCH] appveyor: fix modlist() to allow MODULES in setup files --- appveyor/do.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/appveyor/do.py b/appveyor/do.py index 4a25e9c..86312c2 100644 --- a/appveyor/do.py +++ b/appveyor/do.py @@ -41,9 +41,12 @@ else: def modlist(): - add_modules = os.environ.get('ADD_MODULES', '').upper().split() - modules = os.environ.get('MODULES', '').upper().split() - ret = ['BASE'] + add_modules + modules + for var in ['ADD_MODULES', 'MODULES']: + setup.setdefault(var, '') + if var in os.environ: + setup[var] = os.environ[var] + logger.debug('ENV assignment: %s = %s', var, setup[var]) + ret = ['BASE'] + setup['ADD_MODULES'].upper().split() + setup['MODULES'].upper().split() logger.debug('Effective module list: %s', ret) return ret