commit: 451552da1dcebde961cbc1ce7a95180d9e1c073f Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Sun Feb 25 09:39:18 2024 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Sun Feb 25 09:39:18 2024 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=451552da
Merge remote-tracking branch 'origin/master' into prefix Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> NEWS | 36 +++ bin/install-qa-check.d/90gcc-warnings | 18 +- bin/socks5-server.py | 34 ++- lib/_emerge/PollScheduler.py | 9 +- lib/_emerge/depgraph.py | 15 +- lib/portage/dbapi/__init__.py | 11 +- lib/portage/dbapi/porttree.py | 2 +- lib/portage/process.py | 254 ++++++++++++--------- lib/portage/tests/ebuild/test_doebuild_spawn.py | 3 +- lib/portage/tests/ebuild/test_ipc_daemon.py | 3 +- lib/portage/tests/emerge/conftest.py | 4 +- lib/portage/tests/process/test_spawn_returnproc.py | 2 +- lib/portage/tests/resolver/test_depth.py | 8 +- .../test_emptytree_reinstall_unsatisfiability.py | 137 +++++++++++ lib/portage/tests/resolver/test_useflags.py | 6 +- lib/portage/tests/util/test_socks5.py | 94 ++++++-- lib/portage/util/_async/SchedulerInterface.py | 9 +- lib/portage/util/_eventloop/asyncio_event_loop.py | 44 +++- lib/portage/util/futures/_asyncio/__init__.py | 28 ++- lib/portage/util/socks5.py | 42 +++- meson.build | 2 +- 21 files changed, 574 insertions(+), 187 deletions(-) diff --cc lib/portage/process.py index ead11e3184,cc9ed7bf78..2365778e6a --- a/lib/portage/process.py +++ b/lib/portage/process.py @@@ -35,9 -35,8 +35,10 @@@ portage.proxy.lazyimport.lazyimport ) from portage.const import BASH_BINARY, SANDBOX_BINARY, FAKEROOT_BINARY +# PREFIX LOCAL +from portage.const import MACOSSANDBOX_BINARY from portage.exception import CommandNotFound + from portage.proxy.objectproxy import ObjectProxy from portage.util._ctypes import find_library, LoadLibrary, ctypes try:
