diff options
| author | Ralph Boehme <slow@samba.org> | 2019-03-29 18:18:27 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2019-04-29 17:07:02 +0000 |
| commit | cbee3037a293273191c2c0c12a162589e01c884b (patch) | |
| tree | 75bbced6fc120c066674394b864dc4684cf10b93 /buildtools | |
| parent | 40f91924d6e5ab6d87a5c65256d2df235429d313 (diff) | |
| download | samba-cbee3037a293273191c2c0c12a162589e01c884b.tar.gz | |
waf: only set mandatory to False if not already set by the caller
There are a bunch of callers that call find_program with mandatory=True,
we should not overwrite this when explicity passed, eg:
ctx.find_program('objcopy', var='OBJCOPY', mandatory=True)
conf.SAMBA_CHECK_PERL(mandatory=True)
-> conf.find_program('perl', var='PERL', mandatory=mandatory)
With this patch we only change the default from False to True, but allow
callers to choose specific behaviour.
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Mon Apr 29 17:07:02 UTC 2019 on sn-devel-184
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/wafsamba/samba_waf18.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba_waf18.py b/buildtools/wafsamba/samba_waf18.py index cc310fbf512..c0bb6bfcf55 100644 --- a/buildtools/wafsamba/samba_waf18.py +++ b/buildtools/wafsamba/samba_waf18.py @@ -132,7 +132,9 @@ class ConfigurationContext(Configure.ConfigurationContext): return super(ConfigurationContext, self).init_dirs() def find_program_samba(self, *k, **kw): - kw['mandatory'] = False + # Override the waf default set in the @conf decorator in Configure.py + if 'mandatory' not in kw: + kw['mandatory'] = False ret = self.find_program_old(*k, **kw) return ret Configure.ConfigurationContext.find_program_old = Configure.ConfigurationContext.find_program |