Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage-utils:master commit in: /
Date: Sun, 03 Oct 2021 11:15:22
Message-Id: 1633259695.62998b38d2dec75a06c1fc551244e1e75831e284.grobian@gentoo
1 commit: 62998b38d2dec75a06c1fc551244e1e75831e284
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 3 11:14:55 2021 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 3 11:14:55 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=62998b38
7
8 qmerge: ensure temp dir exists before writing environment to it
9
10 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
11
12 qmerge.c | 3 ++-
13 1 file changed, 2 insertions(+), 1 deletion(-)
14
15 diff --git a/qmerge.c b/qmerge.c
16 index 406121c..aae3e26 100644
17 --- a/qmerge.c
18 +++ b/qmerge.c
19 @@ -740,7 +740,8 @@ pkg_run_func_at(
20 /* TODO: This should be fatal upon error */
21 "emake() { ${MAKE:-make} ${MAKEOPTS} \"$@\"; }\n"
22 /* Unpack the env */
23 - "{ bzip2 -dc '%1$s/environment.bz2' > \"%6$s/environment\" "
24 + "{ mkdir -p \"%6$s\"; "
25 + "bzip2 -dc '%1$s/environment.bz2' > \"%6$s/environment\" "
26 "|| exit 1; }\n"
27 /* Load the main env */
28 ". \"%6$s/environment\"\n"