From 16cfb53e0ab9da8f40740885e5b287a0d912446c Mon Sep 17 00:00:00 2001 From: Victor Pushkarev Date: Fri, 4 Sep 2026 14:54:22 +0300 Subject: [PATCH] release: update-manpages: restore __main__ guard The update-manpages wrapper calls update_manpages.main() unconditionally. With spawn and forkserver, multiprocessing re-executes the directly run main script as __mp_main__. The wrapper then calls main() again and tries to create another Pool while the child is still starting. Protect the entrypoint with __main__ guard. On Linux, this was mostly hidden while fork was the default start method; Python 3.14 now defaults to forkserver there. Normal command-line behavior is unchanged. Add a regression test that mirrors multiprocessing's __mp_main__ execution path and checks that it does not call update_manpages.main(). Change-Id: I28fdb18ccf2e4d61605cc072b4de52b6eb561335 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/626841 Tested-by: Victor Pushkarev Commit-Queue: Victor Pushkarev Reviewed-by: Mike Frysinger Reviewed-by: Gavin Mak --- release/update-manpages | 3 +- tests/test_release_update_manpages.py | 43 +++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 tests/test_release_update_manpages.py diff --git a/release/update-manpages b/release/update-manpages index 6679b1790..0423fffac 100755 --- a/release/update-manpages +++ b/release/update-manpages @@ -23,4 +23,5 @@ import sys import update_manpages -sys.exit(update_manpages.main(sys.argv[1:])) +if __name__ == "__main__": + sys.exit(update_manpages.main(sys.argv[1:])) diff --git a/tests/test_release_update_manpages.py b/tests/test_release_update_manpages.py new file mode 100644 index 000000000..7b2eaef69 --- /dev/null +++ b/tests/test_release_update_manpages.py @@ -0,0 +1,43 @@ +# Copyright (C) 2026 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +"""Tests for the release/update-manpages wrapper.""" + +import runpy +import sys +from types import ModuleType + +import pytest +import utils_for_test + + +UPDATE_MANPAGES_SCRIPT = ( + utils_for_test.THIS_DIR.parent / "release" / "update-manpages" +) + + +def test_wrapper_does_not_run_main_for_multiprocessing_child( + monkeypatch: pytest.MonkeyPatch, +) -> None: + """Do not rerun main when multiprocessing re-executes the wrapper.""" + fake_update_manpages = ModuleType("update_manpages") + + # Mock this because the real module requires newer Python versions than + # our unittest framework does. + monkeypatch.setitem(sys.modules, "update_manpages", fake_update_manpages) + + runpy.run_path( + str(UPDATE_MANPAGES_SCRIPT), + run_name="__mp_main__", + )