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 EAC26138334 for ; Mon, 10 Jun 2019 10:09:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 533E2E0875; Mon, 10 Jun 2019 10:09:11 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 3A185E0875 for ; Mon, 10 Jun 2019 10:09:11 +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 3EA34345B6F for ; Mon, 10 Jun 2019 10:09:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6A214619 for ; Mon, 10 Jun 2019 10:09:06 +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: <1560160990.2b9dfb7df57a83092c8491b61ff9bcdc84e7f47b.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: 2b9dfb7df57a83092c8491b61ff9bcdc84e7f47b X-VCS-Branch: master Date: Mon, 10 Jun 2019 10:09:06 +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: b634b947-c0cc-41ac-9862-076ab8b9fbb3 X-Archives-Hash: 1e8d03bbc31e69a7d6f78a1f5c85b731 commit: 2b9dfb7df57a83092c8491b61ff9bcdc84e7f47b Author: Fabian Groffen gentoo org> AuthorDate: Mon Jun 10 10:03:10 2019 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Mon Jun 10 10:03:10 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=2b9dfb7d qmerge: fix imagefd path 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 31a9648..aa10d9c 100644 --- a/qmerge.c +++ b/qmerge.c @@ -1286,7 +1286,7 @@ pkg_merge(int level, const depend_atom *atom, const struct pkg_t *pkg) pkg_run_func("vdb", phases, "pkg_preinst", D, T); { - int imagefd = open("image" CONFIG_EPREFIX, O_RDONLY); + int imagefd = open(".", O_RDONLY); size_t masklen = strlen(install_mask) + 1 + 15 + 1 + 14 + 1 + 14 + 1 + 1; /* worst case scenario */ char *imask = xmalloc(masklen);