diff options
author | Peter Melnichenko <mpeterval@gmail.com> | 2016-06-13 13:03:03 +0300 |
---|---|---|
committer | Peter Melnichenko <mpeterval@gmail.com> | 2016-06-13 13:03:03 +0300 |
commit | 81332ad45404e7b9ffe72dae0beb311ec5c376d2 (patch) | |
tree | 186c9400915941a64ec150a5f9106769e8b3ec76 | |
parent | 1ea7273e6dc27b02319d2d2f1deb3b59e8c1c917 (diff) | |
download | luarocks-81332ad45404e7b9ffe72dae0beb311ec5c376d2.tar.gz luarocks-81332ad45404e7b9ffe72dae0beb311ec5c376d2.tar.bz2 luarocks-81332ad45404e7b9ffe72dae0beb311ec5c376d2.zip |
Don't use 'run' interface in luarocks.build
Use local 'do_build' function as function for search.act_on_src_or_rockspec
instead. This also gets rid of double permission check and double removal
of other versions.
-rw-r--r-- | src/luarocks/build.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua index 5722deca..f3388c7c 100644 --- a/src/luarocks/build.lua +++ b/src/luarocks/build.lua | |||
@@ -380,7 +380,7 @@ local function do_build(name, version, deps_mode, build_only_deps) | |||
380 | return build.build_rock(name, true, deps_mode, build_only_deps) | 380 | return build.build_rock(name, true, deps_mode, build_only_deps) |
381 | elseif not name:match(dir.separator) then | 381 | elseif not name:match(dir.separator) then |
382 | local search = require("luarocks.search") | 382 | local search = require("luarocks.search") |
383 | return search.act_on_src_or_rockspec(build.run, name:lower(), version, deps.deps_mode_to_flag(deps_mode), build_only_deps and "--only-deps") | 383 | return search.act_on_src_or_rockspec(do_build, name:lower(), version, nil, deps_mode, build_only_deps) |
384 | end | 384 | end |
385 | return nil, "Don't know what to do with "..name | 385 | return nil, "Don't know what to do with "..name |
386 | end | 386 | end |