diff options
author | Hisham <hisham@gobolinux.org> | 2016-06-07 03:37:19 -0300 |
---|---|---|
committer | Hisham <hisham@gobolinux.org> | 2016-06-07 03:37:19 -0300 |
commit | f3caf86759df85f5967b2a6258b000b097813264 (patch) | |
tree | 9680b90224bd73a108c4c417187378fbfc86db92 | |
parent | a7aa85ce84912d817556f46dfe780e8961206ad0 (diff) | |
download | luarocks-f3caf86759df85f5967b2a6258b000b097813264.tar.gz luarocks-f3caf86759df85f5967b2a6258b000b097813264.tar.bz2 luarocks-f3caf86759df85f5967b2a6258b000b097813264.zip |
Check external_dependencies before dependencies.
This allows us to fail quicker before installing
a bunch of other rocks.
-rw-r--r-- | src/luarocks/build.lua | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua index edf4efb4..65f44a64 100644 --- a/src/luarocks/build.lua +++ b/src/luarocks/build.lua | |||
@@ -176,6 +176,14 @@ function build.build_rockspec(rockspec_file, need_to_fetch, minimal_mode, deps_m | |||
176 | return nil, "Rockspec error: build type not specified" | 176 | return nil, "Rockspec error: build type not specified" |
177 | end | 177 | end |
178 | 178 | ||
179 | if not build_only_deps then | ||
180 | local ok | ||
181 | ok, err, errcode = deps.check_external_deps(rockspec, "build") | ||
182 | if err then | ||
183 | return nil, err, errcode | ||
184 | end | ||
185 | end | ||
186 | |||
179 | if deps_mode == "none" then | 187 | if deps_mode == "none" then |
180 | util.printerr("Warning: skipping dependency checks.") | 188 | util.printerr("Warning: skipping dependency checks.") |
181 | else | 189 | else |
@@ -192,12 +200,6 @@ function build.build_rockspec(rockspec_file, need_to_fetch, minimal_mode, deps_m | |||
192 | return name, version | 200 | return name, version |
193 | end | 201 | end |
194 | 202 | ||
195 | local ok | ||
196 | ok, err, errcode = deps.check_external_deps(rockspec, "build") | ||
197 | if err then | ||
198 | return nil, err, errcode | ||
199 | end | ||
200 | |||
201 | if repos.is_installed(name, version) then | 203 | if repos.is_installed(name, version) then |
202 | repos.delete_version(name, version) | 204 | repos.delete_version(name, version) |
203 | end | 205 | end |