summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2019-03-25 23:54:39 +0200
committerNirbheek Chauhan <nirbheek@centricular.com>2019-03-27 19:43:57 +0530
commitf621bef3794d6d7b06fb30b6c8daa7758c4e79e5 (patch)
tree8a448b5fac418056a03b3ca65b3fa51a6c4c0a74
parent40b5abd668c1cd082a34378ad424170ccf3f494d (diff)
downloadmeson-fix5051.tar.gz
Maintain backwards compatibility for one release. Closes #5051.fix5051
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 654f6272f..59f01221c 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')