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 1ECE8159C9B for ; Wed, 7 Aug 2024 14:39:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 444B3E2CAC; Wed, 7 Aug 2024 14:39:48 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 287E7E2CAC for ; Wed, 7 Aug 2024 14:39:48 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5DD6D343080 for ; Wed, 7 Aug 2024 14:39:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E81CCE6F for ; Wed, 7 Aug 2024 14:39:45 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1723041565.9e6451c88e3da11e0eb7b0bd6b1497c5ca4fb67f.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/package/ebuild/doebuild.py X-VCS-Directories: lib/portage/package/ebuild/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 9e6451c88e3da11e0eb7b0bd6b1497c5ca4fb67f X-VCS-Branch: master Date: Wed, 7 Aug 2024 14:39:45 +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: 10a0be27-5b66-4390-8ec3-5b87c9509fa8 X-Archives-Hash: 78be498925785664372cc526f7fc8da0 commit: 9e6451c88e3da11e0eb7b0bd6b1497c5ca4fb67f Author: Zac Medico gentoo org> AuthorDate: Tue Aug 6 04:48:26 2024 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Aug 7 14:39:25 2024 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9e6451c8 doebuild.spawn: Skip socks5 proxy for "depend" phase Skip the socks5 proxy for the "depend" phase. It should not be needed because we only allow bash builtin commands during this phase. Since the socks5 proxy requires portage's event loop to be explictly closed before exit, skipping it will allow programs like eclean-dist to avoid the need to explicitly close portage's event loop before exit. Bug: https://bugs.gentoo.org/937384 Signed-off-by: Zac Medico gentoo.org> lib/portage/package/ebuild/doebuild.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/portage/package/ebuild/doebuild.py b/lib/portage/package/ebuild/doebuild.py index 403836b80b..b5fb46df70 100644 --- a/lib/portage/package/ebuild/doebuild.py +++ b/lib/portage/package/ebuild/doebuild.py @@ -2009,7 +2009,7 @@ def spawn( if ( not networked - and mysettings.get("EBUILD_PHASE") != "nofetch" + and mysettings.get("EBUILD_PHASE") not in ("depend", "nofetch") and ("network-sandbox-proxy" in features or "distcc" in features) ): # Provide a SOCKS5-over-UNIX-socket proxy to escape sandbox