Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/tests/resolver/
Date: Mon, 02 Jan 2023 20:46:02
Message-Id: 1672691729.d1eedbb56386e2e7509c6140a238280aaf55eb17.floppym@gentoo
1 commit: d1eedbb56386e2e7509c6140a238280aaf55eb17
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 31 22:52:25 2022 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 2 20:35:29 2023 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=d1eedbb5
7
8 ResolverPlayground: include PATH in env passed to portage.create_trees()
9
10 Fixes failing tests after previous change to _doebuild_path.
11
12 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
13
14 lib/portage/tests/resolver/ResolverPlayground.py | 3 ++-
15 1 file changed, 2 insertions(+), 1 deletion(-)
16
17 diff --git a/lib/portage/tests/resolver/ResolverPlayground.py b/lib/portage/tests/resolver/ResolverPlayground.py
18 index e43b12dd3..6cd10acda 100644
19 --- a/lib/portage/tests/resolver/ResolverPlayground.py
20 +++ b/lib/portage/tests/resolver/ResolverPlayground.py
21 @@ -686,6 +686,7 @@ class ResolverPlayground:
22 create_trees_kwargs["target_root"] = self.target_root
23
24 env = {
25 + "PATH": os.environ["PATH"],
26 "PORTAGE_REPOSITORIES": "\n".join(
27 "[%s]\n%s"
28 % (
29 @@ -693,7 +694,7 @@ class ResolverPlayground:
30 "\n".join("{} = {}".format(k, v) for k, v in repo_config.items()),
31 )
32 for repo_name, repo_config in self._repositories.items()
33 - )
34 + ),
35 }
36
37 if self.debug: