diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2025-05-19 10:53:48 +0200 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2025-05-21 21:41:40 -0400 |
| commit | 8f4f16521751fe48ba20f0d0b8c7a7d4097815d6 (patch) | |
| tree | 760f2f53643067e2b57abaf069c4f7a875328ac6 | |
| parent | 4b7fd4cad12f84e4307f13aaf7ffecb2d10b2573 (diff) | |
| download | meson-8f4f16521751fe48ba20f0d0b8c7a7d4097815d6.tar.gz | |
options: remove unnecessary Union[OptionKey, str]
classify_D_arguments returns a list with OptionKeys in it. Rename
the function so that the difference with set_option is clear.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | mesonbuild/options.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/mesonbuild/options.py b/mesonbuild/options.py index 8b21cf939..846daa227 100644 --- a/mesonbuild/options.py +++ b/mesonbuild/options.py @@ -1056,11 +1056,7 @@ class OptionStore: return changed - def set_option_from_string(self, keystr: T.Union[OptionKey, str], new_value: str) -> bool: - if isinstance(keystr, OptionKey): - o = keystr - else: - o = OptionKey.from_string(keystr) + def set_option_maybe_root(self, o: OptionKey, new_value: str) -> bool: if o in self.options: return self.set_option(o, new_value) o = o.as_root() @@ -1072,9 +1068,9 @@ class OptionStore: (global_options, perproject_global_options, project_options) = self.classify_D_arguments(D_args) U_args = [] if U_args is None else U_args for key, valstr in global_options: - dirty |= self.set_option_from_string(key, valstr) + dirty |= self.set_option_maybe_root(key, valstr) for key, valstr in project_options: - dirty |= self.set_option_from_string(key, valstr) + dirty |= self.set_option_maybe_root(key, valstr) for key, valstr in perproject_global_options: if key in self.augments: if self.augments[key] != valstr: |