| 1 |
commit: 18966cfe95666636562a1b06b800b711a3e4ab9e |
| 2 |
Author: Joakim Tjernlund <joakim.tjernlund <AT> infinera <DOT> com> |
| 3 |
AuthorDate: Thu Mar 8 21:53:50 2018 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Mar 23 09:19:06 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=18966cfe |
| 7 |
|
| 8 |
ED/EROOT needs '/' appended |
| 9 |
|
| 10 |
Some pkgs does needs it, dev-lang/python-exec is one. |
| 11 |
|
| 12 |
Signed-off-by: Joakim Tjernlund <joakim.tjernlund <AT> infinera.com> |
| 13 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 14 |
|
| 15 |
qmerge.c | 4 ++-- |
| 16 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/qmerge.c b/qmerge.c |
| 19 |
index 07da4cc..ff55a0c 100644 |
| 20 |
--- a/qmerge.c |
| 21 |
+++ b/qmerge.c |
| 22 |
@@ -466,9 +466,9 @@ pkg_run_func_at(int dirfd, const char *vdb_path, const char *phases, const char |
| 23 |
"FILESDIR=/.does/not/exist/anywhere\n" |
| 24 |
"MERGE_TYPE=binary\n" |
| 25 |
"ROOT='%4$s'\n" |
| 26 |
- "EROOT=\"${EPREFIX%%/}/${ROOT#/}\"\n" |
| 27 |
+ "EROOT=\"${EPREFIX%%/}/${ROOT#/}/\"\n" |
| 28 |
"D=\"%5$s\"\n" |
| 29 |
- "ED=\"${EPREFIX%%/}/${D#/}\"\n" |
| 30 |
+ "ED=\"${EPREFIX%%/}/${D#/}/\"\n" |
| 31 |
"T=\"%6$s\"\n" |
| 32 |
/* Finally run the func */ |
| 33 |
"%7$s%2$s\n" |
Archives