1 |
commit: 47ea04c729af2408a3a8bd81a41bf0a260cb1f3e |
2 |
Author: Joakim Tjernlund <joakim.tjernlund <AT> infinera <DOT> com> |
3 |
AuthorDate: Thu May 9 17:25:58 2019 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 10 07:26:06 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=47ea04c7 |
7 |
|
8 |
qmerge: implement keepdir and dodir, bug #682316 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/682316 |
11 |
Signed-off-by: Joakim Tjernlund <joakim.tjernlund <AT> infinera.com> |
12 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
13 |
|
14 |
qmerge.c | 2 ++ |
15 |
1 file changed, 2 insertions(+) |
16 |
|
17 |
diff --git a/qmerge.c b/qmerge.c |
18 |
index e6bbdb5..a144805 100644 |
19 |
--- a/qmerge.c |
20 |
+++ b/qmerge.c |
21 |
@@ -739,6 +739,8 @@ pkg_run_func_at(int dirfd, const char *vdb_path, const char *phases, const char |
22 |
"nonfatal() { \"$@\"; }\n" |
23 |
"ebegin() { printf ' * %%b ...' \"$*\"; }\n" |
24 |
"eend() { local r=${1:-$?}; [ $# -gt 0 ] && shift; [ $r -eq 0 ] && echo ' [ ok ]' || echo \" $* \"'[ !! ]'; return $r; }\n" |
25 |
+ "dodir() { mkdir -p \"$@\"; }\n" |
26 |
+ "keepdir() { dodir \"$@\" && touch \"$@\"/.keep_${CATEGORY}_${PN}-${SLOT%%/*}; }\n" |
27 |
/* TODO: This should be fatal upon error */ |
28 |
"emake() { ${MAKE:-make} ${MAKEOPTS} \"$@\"; }\n" |
29 |
/* Unpack the env if need be */ |