From 4aeef6e86566b3f7ef90b1e6e8cf6d759391e71d Mon Sep 17 00:00:00 2001 From: Tobias Ulmer Date: Thu, 21 Dec 2017 16:21:53 +0100 Subject: [PATCH] e2build: clarify creation of directories Signed-off-by: Tobias Ulmer --- local/e2build.lua | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/local/e2build.lua b/local/e2build.lua index 1cbdabe..e9b47ac 100644 --- a/local/e2build.lua +++ b/local/e2build.lua @@ -362,7 +362,7 @@ function e2build.build_process_class:_chroot_lock(res, rbs) local e = err.new("error locking chroot") bc = res:build_config() - rc, re = e2lib.mkdir_recursive(bc.c) + rc, re = e2lib.mkdir_recursive(bc.base) if not rc then return false, e:cat(re) end @@ -420,10 +420,12 @@ end function e2build.build_process_class:_setup_chroot(res, rbs) local rc, re, bc local e = err.new("error setting up chroot") + -- create the chroot path and create the chroot marker file without root -- permissions. That makes sure we have write permissions here. bc = res:build_config() - rc, re = e2lib.mkdir_recursive(bc.c) + + rc, re = e2lib.mkdir_recursive(bc.base) if not rc then return false, e:cat(re) end @@ -433,9 +435,12 @@ function e2build.build_process_class:_setup_chroot(res, rbs) return false, e:cat(re) end - local cm = rc + rc, re = eio.fclose(rc) + if not rc then + return false, e:cat(re) + end - rc, re = eio.fclose(cm) + rc, re = e2lib.mkdir(bc.c) if not rc then return false, e:cat(re) end -- 2.39.5