diff options
| author | Eli Schwartz <eschwartz93@gmail.com> | 2024-07-05 13:52:40 -0400 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2024-07-05 13:52:40 -0400 |
| commit | f2112d0baa379e01d7ce8a961005f5b7c102d9a9 (patch) | |
| tree | dd3ab36af18e2c78a756bcf81be15a780ed2cb6c /mesonbuild/interpreterbase/_unholder.py | |
| parent | 1ca002a78a48faaf74aa61fcd28b4f2fa5937b47 (diff) | |
| download | meson-f2112d0baa379e01d7ce8a961005f5b7c102d9a9.tar.gz | |
Revert "Clarify mutable objects usage"
This reverts commit 9f02d0a3e5a5ffc82256391c244b1af38e41ef78.
It turns out that this does introduce a behavioral change in existing
users of ConfigurationData, which it wasn't supposed to (it was supposed
to preserve behavior there, and add a new *warning* for
EnvironmentVariables).
This breaks projects such as pulseaudio, libvirt, and probably more.
Roll back the change and try again after 1.5.0 is released.
Fixes: #13372
Diffstat (limited to 'mesonbuild/interpreterbase/_unholder.py')
| -rw-r--r-- | mesonbuild/interpreterbase/_unholder.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mesonbuild/interpreterbase/_unholder.py b/mesonbuild/interpreterbase/_unholder.py index e32b77fc7..c62aafe8e 100644 --- a/mesonbuild/interpreterbase/_unholder.py +++ b/mesonbuild/interpreterbase/_unholder.py @@ -5,7 +5,7 @@ from __future__ import annotations import typing as T -from .baseobjects import InterpreterObject, MesonInterpreterObject, ObjectHolder, HoldableTypes, MutableInterpreterObject +from .baseobjects import InterpreterObject, MesonInterpreterObject, ObjectHolder, HoldableTypes from .exceptions import InvalidArguments from ..mesonlib import HoldableObject, MesonBugException @@ -13,8 +13,6 @@ if T.TYPE_CHECKING: from .baseobjects import TYPE_var def _unholder(obj: InterpreterObject) -> TYPE_var: - if isinstance(obj, MutableInterpreterObject): - obj.mark_used() if isinstance(obj, ObjectHolder): assert isinstance(obj.held_object, HoldableTypes) return obj.held_object |