aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/luarocks/build.lua14
-rw-r--r--src/luarocks/download.lua2
-rw-r--r--src/luarocks/remove.lua2
3 files changed, 10 insertions, 8 deletions
diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua
index 0e72ca85..5722deca 100644
--- a/src/luarocks/build.lua
+++ b/src/luarocks/build.lua
@@ -177,6 +177,14 @@ function build.build_rockspec(rockspec_file, need_to_fetch, minimal_mode, deps_m
177 return nil, "Rockspec error: build type not specified" 177 return nil, "Rockspec error: build type not specified"
178 end 178 end
179 179
180 if not build_only_deps then
181 local ok
182 ok, err, errcode = deps.check_external_deps(rockspec, "build")
183 if err then
184 return nil, err, errcode
185 end
186 end
187
180 if deps_mode == "none" then 188 if deps_mode == "none" then
181 util.printerr("Warning: skipping dependency checks.") 189 util.printerr("Warning: skipping dependency checks.")
182 else 190 else
@@ -193,12 +201,6 @@ function build.build_rockspec(rockspec_file, need_to_fetch, minimal_mode, deps_m
193 return name, version 201 return name, version
194 end 202 end
195 203
196 local ok
197 ok, err, errcode = deps.check_external_deps(rockspec, "build")
198 if err then
199 return nil, err, errcode
200 end
201
202 if repos.is_installed(name, version) then 204 if repos.is_installed(name, version) then
203 repos.delete_version(name, version) 205 repos.delete_version(name, version)
204 end 206 end
diff --git a/src/luarocks/download.lua b/src/luarocks/download.lua
index 2e434b03..18573ae4 100644
--- a/src/luarocks/download.lua
+++ b/src/luarocks/download.lua
@@ -88,7 +88,7 @@ end
88function download.command(flags, name, version) 88function download.command(flags, name, version)
89 assert(type(version) == "string" or not version) 89 assert(type(version) == "string" or not version)
90 if type(name) ~= "string" and not flags["all"] then 90 if type(name) ~= "string" and not flags["all"] then
91 return nil, "Argument missing, see help." 91 return nil, "Argument missing. "..util.see_help("download")
92 end 92 end
93 if not name then name, version = "", "" end 93 if not name then name, version = "", "" end
94 94
diff --git a/src/luarocks/remove.lua b/src/luarocks/remove.lua
index 38851d36..d72fabaf 100644
--- a/src/luarocks/remove.lua
+++ b/src/luarocks/remove.lua
@@ -139,7 +139,7 @@ end
139-- successful, nil and an error message otherwise. exitcode is optionally returned. 139-- successful, nil and an error message otherwise. exitcode is optionally returned.
140function remove.command(flags, name, version) 140function remove.command(flags, name, version)
141 if type(name) ~= "string" then 141 if type(name) ~= "string" then
142 return nil, "Argument missing, see help." 142 return nil, "Argument missing. "..util.see_help("remove")
143 end 143 end
144 144
145 local deps_mode = flags["deps-mode"] or cfg.deps_mode 145 local deps_mode = flags["deps-mode"] or cfg.deps_mode