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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 830441382C5 for ; Sat, 5 Jun 2021 18:47:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF06FE0829; Sat, 5 Jun 2021 18:47:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BF5BFE0829 for ; Sat, 5 Jun 2021 18:47:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C2D6A335D95 for ; Sat, 5 Jun 2021 18:47:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 62F1075B for ; Sat, 5 Jun 2021 18:47:05 +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: <1622918070.916aba5a91733a2f39ea26e35879fc2f993e7ad1.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/ebuild-ipc.py bin/portageq X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 916aba5a91733a2f39ea26e35879fc2f993e7ad1 X-VCS-Branch: master Date: Sat, 5 Jun 2021 18:47:05 +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: 9da248ed-c44e-43a4-8538-29baac4cd3f8 X-Archives-Hash: cf81ffea28b61337df7c49d5dfb23c3f commit: 916aba5a91733a2f39ea26e35879fc2f993e7ad1 Author: Michał Górny gentoo org> AuthorDate: Fri Jun 4 07:07:44 2021 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Jun 5 18:34:30 2021 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=916aba5a Replace deprecated distutils.sysconfig uses Closes: https://github.com/gentoo/portage/pull/725 Signed-off-by: Michał Górny gentoo.org> Signed-off-by: Zac Medico gentoo.org> bin/ebuild-ipc.py | 6 ++++-- bin/portageq | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/bin/ebuild-ipc.py b/bin/ebuild-ipc.py index 32f6d53b9..fa6ac4395 100755 --- a/bin/ebuild-ipc.py +++ b/bin/ebuild-ipc.py @@ -43,8 +43,10 @@ if os.path.isfile(os.path.join(os.path.dirname(os.path.dirname(os.path.realpath( pym_paths = [os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "lib")] sys.path.insert(0, pym_paths[0]) else: - import distutils.sysconfig - pym_paths = [os.path.join(distutils.sysconfig.get_python_lib(), x) for x in ("_emerge", "portage")] + import sysconfig + pym_paths = [ + os.path.join(sysconfig.get_path("purelib"), x) for x in ("_emerge", "portage") + ] # Avoid sandbox violations after Python upgrade. if os.environ.get("SANDBOX_ON") == "1": sandbox_write = os.environ.get("SANDBOX_WRITE", "").split(":") diff --git a/bin/portageq b/bin/portageq index 67fdc9d38..385259f9d 100755 --- a/bin/portageq +++ b/bin/portageq @@ -26,8 +26,10 @@ if os.path.isfile(os.path.join(os.path.dirname(os.path.dirname(os.path.realpath( pym_paths = [os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "lib")] sys.path.insert(0, pym_paths[0]) else: - import distutils.sysconfig - pym_paths = [os.path.join(distutils.sysconfig.get_python_lib(), x) for x in ("_emerge", "portage")] + import sysconfig + pym_paths = [ + os.path.join(sysconfig.get_path("purelib"), x) for x in ("_emerge", "portage") + ] # Avoid sandbox violations after Python upgrade. if os.environ.get("SANDBOX_ON") == "1": sandbox_write = os.environ.get("SANDBOX_WRITE", "").split(":")