| 1 |
commit: a1c3e594cd2cbf49f8eacac038e1b8f8cfb64199 |
| 2 |
Author: Joakim Tjernlund <joakim.tjernlund <AT> infinera <DOT> com> |
| 3 |
AuthorDate: Wed Jun 16 14:52:59 2021 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 16 19:19:43 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=a1c3e594 |
| 7 |
|
| 8 |
qmerge: Use same image dir. name as portage |
| 9 |
|
| 10 |
atom_to_string(mpkg->atom) will attach ::gentoo to name which is |
| 11 |
different from portage. |
| 12 |
|
| 13 |
Signed-off-by: Joakim Tjernlund <joakim.tjernlund <AT> infinera.com> |
| 14 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 15 |
|
| 16 |
qmerge.c | 2 +- |
| 17 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/qmerge.c b/qmerge.c |
| 20 |
index 3b74426..ac7ce6d 100644 |
| 21 |
--- a/qmerge.c |
| 22 |
+++ b/qmerge.c |
| 23 |
@@ -1108,7 +1108,7 @@ pkg_merge(int level, const depend_atom *qatom, const tree_match_ctx *mpkg) |
| 24 |
} |
| 25 |
|
| 26 |
/* Set up our temp dir to unpack this stuff FIXME p -> builddir */ |
| 27 |
- xasprintf(&p, "%s/qmerge/%s", port_tmpdir, atom_to_string(mpkg->atom)); |
| 28 |
+ xasprintf(&p, "%s/qmerge/%s/%s", port_tmpdir, mpkg->atom->CATEGORY, mpkg->atom->PF); |
| 29 |
mkdir_p(p, 0755); |
| 30 |
xchdir(p); |
| 31 |
xasprintf(&D, "%s/image", p); |
Archives