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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7600C158094 for ; Mon, 25 Jul 2022 22:01:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 88F77E0C04; Mon, 25 Jul 2022 22:01:36 +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 6669FE0C04 for ; Mon, 25 Jul 2022 22:01:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 73825340E76 for ; Mon, 25 Jul 2022 22:01:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AD67E448 for ; Mon, 25 Jul 2022 22:01:33 +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: <1658785024.44ea72efd7378cb26cb58cea7534449b1f4968c6.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/tests/resolver/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/tests/resolver/ResolverPlayground.py X-VCS-Directories: lib/portage/tests/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 44ea72efd7378cb26cb58cea7534449b1f4968c6 X-VCS-Branch: master Date: Mon, 25 Jul 2022 22:01:33 +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: 33f1f598-0b2d-455d-a6a6-06a8b4b5477d X-Archives-Hash: f75c76bd7a6ac328b63b327dd50ddf01 commit: 44ea72efd7378cb26cb58cea7534449b1f4968c6 Author: Zac Medico gentoo org> AuthorDate: Mon Jul 25 21:36:16 2022 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Jul 25 21:37:04 2022 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=44ea72ef ResolverPlayground: unconditionally setup essential_binaries Closes: https://bugs.gentoo.org/861077 Signed-off-by: Zac Medico gentoo.org> lib/portage/tests/resolver/ResolverPlayground.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/portage/tests/resolver/ResolverPlayground.py b/lib/portage/tests/resolver/ResolverPlayground.py index 788334f89..361de16af 100644 --- a/lib/portage/tests/resolver/ResolverPlayground.py +++ b/lib/portage/tests/resolver/ResolverPlayground.py @@ -129,8 +129,11 @@ class ResolverPlayground: """ self.debug = debug - if eprefix is None: - self.eprefix = normalize_path(tempfile.mkdtemp()) + if True: + if eprefix is None: + self.eprefix = normalize_path(tempfile.mkdtemp()) + else: + self.eprefix = normalize_path(eprefix) # EPREFIX/bin is used by fake true_binaries. Real binaries goes into EPREFIX/usr/bin eubin = os.path.join(self.eprefix, "usr", "bin") @@ -192,8 +195,6 @@ class ResolverPlayground: os.symlink(path, os.path.join(eubin, x)) finally: os.environ["PATH"] = orig_path - else: - self.eprefix = normalize_path(eprefix) # Tests may override portage.const.EPREFIX in order to # simulate a prefix installation. It's reasonable to do