From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1095272-garchives=archives.gentoo.org@lists.gentoo.org>
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 2F514138334
for <garchives@archives.gentoo.org>; Mon, 10 Jun 2019 10:12:48 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 4BEDEE0837;
Mon, 10 Jun 2019 10:12:47 +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 2A314E0837
for <gentoo-commits@lists.gentoo.org>; Mon, 10 Jun 2019 10:12:47 +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 DD5E7345B67
for <gentoo-commits@lists.gentoo.org>; Mon, 10 Jun 2019 10:12:45 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 4485757B
for <gentoo-commits@lists.gentoo.org>; Mon, 10 Jun 2019 10:12:44 +0000 (UTC)
From: "Fabian Groffen" <grobian@gentoo.org>
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" <grobian@gentoo.org>
Message-ID: <1560161531.33f093218ac4c0c401ff38e1f0326ec9b708915a.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: 33f093218ac4c0c401ff38e1f0326ec9b708915a
X-VCS-Branch: master
Date: Mon, 10 Jun 2019 10:12:44 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 4e5010c1-084c-4ecf-902d-37b505fd6139
X-Archives-Hash: a555536ca62db9dd776d620f6316f4d2
commit: 33f093218ac4c0c401ff38e1f0326ec9b708915a
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 10 10:12:11 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jun 10 10:12:11 2019 +0000
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=33f09321
Revert "qmerge: fix imagefd path"
This reverts commit 2b9dfb7df57a83092c8491b61ff9bcdc84e7f47b.
this was a thinko, the problem laid elsewhere
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 b36d709..5a28544 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(".", O_RDONLY);
+ int imagefd = open("image" CONFIG_EPREFIX, O_RDONLY);
size_t masklen = strlen(install_mask) + 1 +
15 + 1 + 14 + 1 + 14 + 1 + 1; /* worst case scenario */
char *imask = xmalloc(masklen);