commit: 44ea72efd7378cb26cb58cea7534449b1f4968c6 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Mon Jul 25 21:36:16 2022 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> 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 <zmedico <AT> 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
