diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2022-11-19 23:22:53 -0500 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2022-11-20 23:08:44 +0200 |
| commit | e5ce7f0770ce392dfefffe3c0d66dcc024b41ad0 (patch) | |
| tree | 748c3477d5323c60629dc4a2d526b15b01f5f600 | |
| parent | e0240515a629e2f8085a1a64470edeb3d9a668b4 (diff) | |
| download | meson-e5ce7f0770ce392dfefffe3c0d66dcc024b41ad0.zip meson-e5ce7f0770ce392dfefffe3c0d66dcc024b41ad0.tar.gz meson-e5ce7f0770ce392dfefffe3c0d66dcc024b41ad0.tar.bz2 | |
hotdoc module: fix broken include paths
Since commit 32b14b1bb533e10c7344c2e04125a226553c9b9f, hotdoc is run
during configure as an external program. It turns out though, that in
some cases we passed NoneType in the cmd array, previously to
hotdoc.run_hotdoc.run() and now via subprocesses. The former "worked"
due to ignoring unknown arguments (?) but the latter was broken because
command line interfaces don't accept python NoneType objects, naturally.
End result: when for example building Meson's own documentation, this
fails with a python traceback.
The reason this happens to begin with turns out to be, once again,
because of the legacy debt of homebrewed kwargs parsing. We have a
function for `process_known_args` that handles args and ignores them if
they are NoneType, and then include_paths is handled via a custom
processor that internally adds them, then returns a *list* of NoneType
which then gets appended to the global cmd, because the logic ends up as
`[None, None] is None` which is a failed check, so we go ahead and add
it.
It's odd that we ever attempted to process it twice to begin with, so
let's simply not do that.
| -rw-r--r-- | mesonbuild/modules/hotdoc.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mesonbuild/modules/hotdoc.py b/mesonbuild/modules/hotdoc.py index c0eb127..3dac9be 100644 --- a/mesonbuild/modules/hotdoc.py +++ b/mesonbuild/modules/hotdoc.py @@ -283,8 +283,7 @@ class HotdocTargetBuilder: self.process_known_arg("--project-version") self.process_known_arg("--sitemap", value_processor=self.ensure_file) self.process_known_arg("--html-extra-theme", value_processor=self.ensure_dir) - self.process_known_arg(None, "include_paths", - value_processor=lambda x: [self.include_paths.add(self.ensure_dir(v)) for v in x]) + self.include_paths.update(self.ensure_dir(v) for v in self.kwargs.pop('include_paths')) self.process_known_arg('--c-include-directories', argname="dependencies", value_processor=self.process_dependencies) self.process_gi_c_source_roots() self.process_extra_assets() |