From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 803A51382C5 for ; Wed, 16 Jun 2021 19:21:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D7844E0827; Wed, 16 Jun 2021 19:21:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BF26AE0827 for ; Wed, 16 Jun 2021 19:21:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A1528335DA0 for ; Wed, 16 Jun 2021 19:21:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 255FE7AF for ; Wed, 16 Jun 2021 19:21:51 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1623871183.a1c3e594cd2cbf49f8eacac038e1b8f8cfb64199.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: / X-VCS-Repository: proj/portage-utils X-VCS-Files: qmerge.c X-VCS-Directories: / X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: a1c3e594cd2cbf49f8eacac038e1b8f8cfb64199 X-VCS-Branch: master Date: Wed, 16 Jun 2021 19:21:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bd3ee872-19fb-4da5-9d6e-b095e78d2018 X-Archives-Hash: 012cca7253c0da26d7265e2278658b7f commit: a1c3e594cd2cbf49f8eacac038e1b8f8cfb64199 Author: Joakim Tjernlund infinera com> AuthorDate: Wed Jun 16 14:52:59 2021 +0000 Commit: Fabian Groffen gentoo 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 infinera.com> Signed-off-by: Fabian Groffen 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);