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

[Fabian Groffen]

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);