Fixup e2lib.chmod() callers

Signed-off-by: Tobias Ulmer <tu@emlix.com>

diff --git a/generic/cache.lua b/generic/cache.lua
index da1cc6df7f78b863c733293387e4e866581cfbd6..dc5690f6c86ec42b47e5da9557817a3dcbdce40d 100644 (file)
--- 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 006a56cc5aed7896993ec4f27670dc81e47069b3..4eeb2f1300db576fb2285fb6d97b3d03023f7a74 100644 (file)
--- 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