From f7f5e2a725d63eb15f627713129bb6c22d573106 Mon Sep 17 00:00:00 2001 From: Andrei Alexeyev <0x416b617269@gmail.com> Date: Sun, 1 Jul 2018 19:55:38 +0300 Subject: Don't let build_always take precedence over build_by_default (#3816) * Don't let build_always take precedence over build_by_default * Test for proper interaction of build_by_default with build_always Fixes #3815 --- mesonbuild/build.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mesonbuild/build.py') diff --git a/mesonbuild/build.py b/mesonbuild/build.py index ec0d8cc..6ee13d2 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -1797,7 +1797,8 @@ class CustomTarget(Target): raise InvalidArguments('build_always and build_always_stale are mutually exclusive. Combine build_by_default and build_always_stale.') elif 'build_always' in kwargs: mlog.warning('build_always is deprecated. Combine build_by_default and build_always_stale instead.') - self.build_by_default = kwargs['build_always'] + if 'build_by_default' not in kwargs: + self.build_by_default = kwargs['build_always'] self.build_always_stale = kwargs['build_always'] elif 'build_always_stale' in kwargs: self.build_always_stale = kwargs['build_always_stale'] -- cgit v1.1