From 518e3b4f49f95a345d5f93600c85ce61b0f9fc41 Mon Sep 17 00:00:00 2001 From: Hisham Date: Tue, 25 Oct 2016 16:43:18 -0200 Subject: Check rockspec_version before running type check. --- src/luarocks/fetch.lua | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/luarocks/fetch.lua b/src/luarocks/fetch.lua index 37db78f4..d03de1c6 100644 --- a/src/luarocks/fetch.lua +++ b/src/luarocks/fetch.lua @@ -196,6 +196,12 @@ function fetch.load_local_rockspec(filename, quick) end local globals = err + if rockspec.rockspec_format then + if deps.compare_versions(rockspec.rockspec_format, type_check.rockspec_format) then + return nil, "Rockspec format "..rockspec.rockspec_format.." is not supported, please upgrade LuaRocks." + end + end + if not quick then local ok, err = type_check.type_check_rockspec(rockspec, globals) if not ok then @@ -203,11 +209,6 @@ function fetch.load_local_rockspec(filename, quick) end end - if rockspec.rockspec_format then - if deps.compare_versions(rockspec.rockspec_format, type_check.rockspec_format) then - return nil, "Rockspec format "..rockspec.rockspec_format.." is not supported, please upgrade LuaRocks." - end - end rockspec.format_is_at_least = deps.format_is_at_least util.platform_overrides(rockspec.build) -- cgit v1.2.3-55-g6feb