[gentoo-commits] proj/portage-utils:master commit in: /

[Fabian Groffen]

commit:     18966cfe95666636562a1b06b800b711a3e4ab9e
Author:     Joakim Tjernlund <joakim.tjernlund <AT> infinera <DOT> com>
AuthorDate: Thu Mar  8 21:53:50 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Mar 23 09:19:06 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=18966cfe

ED/EROOT needs '/' appended

Some pkgs does needs it, dev-lang/python-exec is one.

Signed-off-by: Joakim Tjernlund <joakim.tjernlund <AT> infinera.com>
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 qmerge.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qmerge.c b/qmerge.c
index 07da4cc..ff55a0c 100644
--- a/qmerge.c
+++ b/qmerge.c
@@ -466,9 +466,9 @@ pkg_run_func_at(int dirfd, const char *vdb_path, const char 
*phases, const char
                "FILESDIR=/.does/not/exist/anywhere\n"
                "MERGE_TYPE=binary\n"
                "ROOT='%4$s'\n"
-               "EROOT=\"${EPREFIX%%/}/${ROOT#/}\"\n"
+               "EROOT=\"${EPREFIX%%/}/${ROOT#/}/\"\n"
                "D=\"%5$s\"\n"
-               "ED=\"${EPREFIX%%/}/${D#/}\"\n"
+               "ED=\"${EPREFIX%%/}/${D#/}/\"\n"
                "T=\"%6$s\"\n"
                /* Finally run the func */
                "%7$s%2$s\n"