From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CA5DC158041 for ; Sun, 25 Feb 2024 09:40:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1F4E1E2A0D; Sun, 25 Feb 2024 09:40:18 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0122CE2A0D for ; Sun, 25 Feb 2024 09:40:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0974333BF60 for ; Sun, 25 Feb 2024 09:40:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6D728B2F for ; Sun, 25 Feb 2024 09:40:15 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1708853958.451552da1dcebde961cbc1ce7a95180d9e1c073f.grobian@gentoo> Subject: [gentoo-commits] proj/portage:prefix commit in: / X-VCS-Repository: proj/portage X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 451552da1dcebde961cbc1ce7a95180d9e1c073f X-VCS-Branch: prefix Date: Sun, 25 Feb 2024 09:40:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 79345320-ed88-4700-a8d3-d730f333638d X-Archives-Hash: 95923c3fc8e8cd87d9a000e59e909ed9 commit: 451552da1dcebde961cbc1ce7a95180d9e1c073f Author: Fabian Groffen gentoo org> AuthorDate: Sun Feb 25 09:39:18 2024 +0000 Commit: Fabian Groffen gentoo 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 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: