aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2019-03-25 23:54:39 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2019-03-27 20:44:17 +0200
commit68567482f519918cbbf01c3010e62a4c75001631 (patch)
tree4e8cb2969a2735592379d43725fdde0d21732c1d
parentb565eff084faeea8a8952ec2c1fe40483705aaef (diff)
downloadmeson-68567482f519918cbbf01c3010e62a4c75001631.zip
meson-68567482f519918cbbf01c3010e62a4c75001631.tar.gz
meson-68567482f519918cbbf01c3010e62a4c75001631.tar.bz2
Maintain backwards compatibility for one release. Closes #5051.
Also, specify what the replacement is.
-rw-r--r--mesonbuild/interpreter.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index c17298e..3d91dc9 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -3634,7 +3634,12 @@ This will become a hard error in the future.''' % kwargs['input'], location=self
mlog.deprecation('Please use the new `install:` kwarg instead of passing '
'`false` to `install_dir:`', location=node)
if not isinstance(idir, str):
- raise InterpreterException('"install_dir" must be a string')
+ if isinstance(idir, list) and len(idir) == 0:
+ mlog.deprecation('install_dir: kwarg must be a string and not an empty array. '
+ 'Please use the install: kwarg to enable or disable installation. '
+ 'This will be a hard error in the next release.')
+ else:
+ raise InterpreterException('"install_dir" must be a string')
install = kwargs.get('install', idir != '')
if not isinstance(install, bool):
raise InterpreterException('"install" must be a boolean')