diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2013-07-04 15:28:30 -0300 |
---|---|---|
committer | Hisham Muhammad <hisham@gobolinux.org> | 2013-07-04 15:28:30 -0300 |
commit | b93f78960c9bc24a49bd95022d11e951972f16ff (patch) | |
tree | 2ac8ba1c4655a509bee47c58bf9c2916eaa10f78 | |
parent | 8fb82e6e543d916e35aa68e887bba8217f9b50d0 (diff) | |
download | luarocks-b93f78960c9bc24a49bd95022d11e951972f16ff.tar.gz luarocks-b93f78960c9bc24a49bd95022d11e951972f16ff.tar.bz2 luarocks-b93f78960c9bc24a49bd95022d11e951972f16ff.zip |
Add support for "remove on install" for `luarocks make` too
-rw-r--r-- | src/luarocks/make.lua | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/luarocks/make.lua b/src/luarocks/make.lua index 027b9fa6..474662ac 100644 --- a/src/luarocks/make.lua +++ b/src/luarocks/make.lua | |||
@@ -11,6 +11,7 @@ local util = require("luarocks.util") | |||
11 | local cfg = require("luarocks.cfg") | 11 | local cfg = require("luarocks.cfg") |
12 | local fetch = require("luarocks.fetch") | 12 | local fetch = require("luarocks.fetch") |
13 | local pack = require("luarocks.pack") | 13 | local pack = require("luarocks.pack") |
14 | local remove = require("luarocks.remove") | ||
14 | local deps = require("luarocks.deps") | 15 | local deps = require("luarocks.deps") |
15 | 16 | ||
16 | help_summary = "Compile package in current directory using a rockspec." | 17 | help_summary = "Compile package in current directory using a rockspec." |
@@ -67,6 +68,13 @@ function run(...) | |||
67 | else | 68 | else |
68 | local ok, err = fs.check_command_permissions(flags) | 69 | local ok, err = fs.check_command_permissions(flags) |
69 | if not ok then return nil, err end | 70 | if not ok then return nil, err end |
70 | return build.build_rockspec(rockspec, false, true, deps.get_deps_mode(flags)) | 71 | ok, err = build.build_rockspec(rockspec, false, true, deps.get_deps_mode(flags)) |
72 | if not ok then return nil, err end | ||
73 | local name, version = ok, err | ||
74 | if (not flags["keep"]) and not cfg.keep_other_versions then | ||
75 | local ok, err = remove.remove_other_versions(name, version, flags["force"]) | ||
76 | if not ok then util.printerr(err) end | ||
77 | end | ||
78 | return name, version | ||
71 | end | 79 | end |
72 | end | 80 | end |