From 7037d5e3898441f1383e7684aaa89ee4c0fc8477 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Wed, 20 Jun 2018 19:39:52 -0300 Subject: rockspecs: propagate failure when parsing dependencies --- src/luarocks/rockspecs.lua | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/luarocks/rockspecs.lua b/src/luarocks/rockspecs.lua index 373f6caa..e9fb73be 100644 --- a/src/luarocks/rockspecs.lua +++ b/src/luarocks/rockspecs.lua @@ -57,6 +57,7 @@ local function convert_dependencies(rockspec, key) else rockspec[key] = {} end + return true end --- Set up path-related variables for a given rock. @@ -145,9 +146,12 @@ function rockspecs.from_persisted_table(filename, rockspec, globals, quick) and cfg.rocks_provided_3_0 or cfg.rocks_provided) - convert_dependencies(rockspec, "dependencies") - convert_dependencies(rockspec, "build_dependencies") - convert_dependencies(rockspec, "test_dependencies") + for _, key in ipairs({"dependencies", "build_dependencies", "test_dependencies"}) do + local ok, err = convert_dependencies(rockspec, key) + if not ok then + return nil, err + end + end if not quick then configure_paths(rockspec) -- cgit v1.2.3-55-g6feb