From be1ed3c6c908603284bb281b6123f345b9bdcb4e Mon Sep 17 00:00:00 2001 From: Tobias Ulmer Date: Tue, 8 Oct 2013 14:29:30 +0200 Subject: [PATCH] Fixup e2lib.chmod() callers Signed-off-by: Tobias Ulmer --- generic/cache.lua | 3 +-- local/e2build.lua | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/generic/cache.lua b/generic/cache.lua index da1cc6d..dc5690f 100644 --- a/generic/cache.lua +++ b/generic/cache.lua @@ -330,8 +330,7 @@ function cache.fetch_file(c, server, location, destdir, destname, flags) end end if flags.chmod then - local f = string.format("%s/%s", destdir, destname) - rc, re = e2lib.chmod(flags.chmod, f) + rc, re = e2lib.chmod(e2lib.join(destdir, destname), flags.chmod) if not rc then return false, e:cat(re) end diff --git a/local/e2build.lua b/local/e2build.lua index 006a56c..4eeb2f1 100644 --- a/local/e2build.lua +++ b/local/e2build.lua @@ -1310,8 +1310,7 @@ local function collect_project(info, r, return_flags) "detect_tool", } for _,f in ipairs(executables) do - local x = e2lib.join(destdir, f) - local rc, re = e2lib.chmod("755", x) + rc, re = e2lib.chmod(e2lib.join(destdir, f), "755") if not rc then return false, e:cat(re) end -- 2.39.5