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

[Fabian Groffen]

commit:     a1c3e594cd2cbf49f8eacac038e1b8f8cfb64199
Author:     Joakim Tjernlund <joakim.tjernlund <AT> infinera <DOT> com>
AuthorDate: Wed Jun 16 14:52:59 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jun 16 19:19:43 2021 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=a1c3e594

qmerge: Use same image dir. name as portage

atom_to_string(mpkg->atom) will attach ::gentoo to name which is
different from portage.

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

 qmerge.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qmerge.c b/qmerge.c
index 3b74426..ac7ce6d 100644
--- a/qmerge.c
+++ b/qmerge.c
@@ -1108,7 +1108,7 @@ pkg_merge(int level, const depend_atom *qatom, const 
tree_match_ctx *mpkg)
        }
 
        /* Set up our temp dir to unpack this stuff   FIXME p -> builddir */
-       xasprintf(&p, "%s/qmerge/%s", port_tmpdir, atom_to_string(mpkg->atom));
+       xasprintf(&p, "%s/qmerge/%s/%s", port_tmpdir, mpkg->atom->CATEGORY, 
mpkg->atom->PF);
        mkdir_p(p, 0755);
        xchdir(p);
        xasprintf(&D, "%s/image", p);