diff options
| author | Benoit Pierre <benoit.pierre@gmail.com> | 2021-11-24 19:52:44 +0100 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2021-11-25 20:13:53 -0500 |
| commit | 007c4659c2154755fc1f57d415afc8a736f81af2 (patch) | |
| tree | ff3e72def4535ac89b70d392f9447b73d552e027 /mesonbuild/interpreter/interpreterobjects.py | |
| parent | 858b114d5cf83827f1bd0fd123b0e00cc1f63961 (diff) | |
| download | meson-007c4659c2154755fc1f57d415afc8a736f81af2.zip meson-007c4659c2154755fc1f57d415afc8a736f81af2.tar.gz meson-007c4659c2154755fc1f57d415afc8a736f81af2.tar.bz2 | |
interpreter: fix `feature.require` handling of error message
Don't show a blank error when no `error_message` was passed as argument.
Diffstat (limited to 'mesonbuild/interpreter/interpreterobjects.py')
| -rw-r--r-- | mesonbuild/interpreter/interpreterobjects.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/interpreter/interpreterobjects.py b/mesonbuild/interpreter/interpreterobjects.py index ccaa1c7..b3dbe55 100644 --- a/mesonbuild/interpreter/interpreterobjects.py +++ b/mesonbuild/interpreter/interpreterobjects.py @@ -139,7 +139,8 @@ class FeatureOptionHolder(ObjectHolder[coredata.UserFeatureOption]): assert isinstance(error_message, str) if self.value == 'enabled': prefix = f'Feature {self.held_object.name} cannot be enabled' - prefix = prefix + ': ' if error_message else '' + if error_message: + prefix += ': ' raise InterpreterException(prefix + error_message) return self.as_disabled() |