commit: e9d6782ca18b2f30d97b4859419bf7da4da01bab Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Sun Oct 22 21:24:47 2023 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Sun Oct 22 22:45:02 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=e9d6782c
doebuild: Make _fetch_subprocess compatible with spawn Before it failed like this with the multiprocessing spawn start method: AttributeError: Can't pickle local object 'doebuild.<locals>._fetch_subprocess' Bug: https://bugs.gentoo.org/916139 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> lib/portage/package/ebuild/doebuild.py | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/lib/portage/package/ebuild/doebuild.py b/lib/portage/package/ebuild/doebuild.py index b967fc061f..ba166173a8 100644 --- a/lib/portage/package/ebuild/doebuild.py +++ b/lib/portage/package/ebuild/doebuild.py @@ -1305,21 +1305,6 @@ def doebuild( if mf is not None: dist_digests = mf.getTypeDigests("DIST") - def _fetch_subprocess(fetchme, mysettings, listonly, dist_digests): - # For userfetch, drop privileges for the entire fetch call, in - # order to handle DISTDIR on NFS with root_squash for bug 601252. - if _want_userfetch(mysettings): - _drop_privs_userfetch(mysettings) - - return fetch( - fetchme, - mysettings, - listonly=listonly, - fetchonly=fetchonly, - allow_missing_digests=False, - digests=dist_digests, - ) - loop = asyncio._safe_loop() if loop.is_running(): # Called by EbuildFetchonly for emerge --pretend --fetchonly. @@ -1340,6 +1325,7 @@ def doebuild( mysettings, listonly, dist_digests, + fetchonly, ) ) if not success: @@ -1589,6 +1575,22 @@ def doebuild( portage._doebuild_manifest_exempt_depend -= 1 +def _fetch_subprocess(fetchme, mysettings, listonly, dist_digests, fetchonly): + # For userfetch, drop privileges for the entire fetch call, in + # order to handle DISTDIR on NFS with root_squash for bug 601252. + if _want_userfetch(mysettings): + _drop_privs_userfetch(mysettings) + + return fetch( + fetchme, + mysettings, + listonly=listonly, + fetchonly=fetchonly, + allow_missing_digests=False, + digests=dist_digests, + ) + + def _check_temp_dir(settings): if "PORTAGE_TMPDIR" not in settings or not os.path.isdir( settings["PORTAGE_TMPDIR"]
