aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorV1K1NGbg <victor@ilchev.com>2024-08-06 22:53:54 +0300
committerV1K1NGbg <victor@ilchev.com>2024-08-06 22:53:54 +0300
commite32e1c7a8e3d93c30968dcb51c674c4da4046012 (patch)
tree29b859b0a46d10d7626bbef37ad9832ddf3dcda6
parentbe39f1507a7b936ed48bc71ea22ccde8af4ba97a (diff)
downloadluarocks-e32e1c7a8e3d93c30968dcb51c674c4da4046012.tar.gz
luarocks-e32e1c7a8e3d93c30968dcb51c674c4da4046012.tar.bz2
luarocks-e32e1c7a8e3d93c30968dcb51c674c4da4046012.zip
rockspecs
-rw-r--r--src/luarocks/rockspecs.lua24
1 files changed, 8 insertions, 16 deletions
diff --git a/src/luarocks/rockspecs.lua b/src/luarocks/rockspecs.lua
index 337de233..a3b22f07 100644
--- a/src/luarocks/rockspecs.lua
+++ b/src/luarocks/rockspecs.lua
@@ -66,9 +66,6 @@ local function platform_overrides(tbl)
66end 66end
67 67
68local function convert_dependencies(dependencies) 68local function convert_dependencies(dependencies)
69 if not dependencies then
70 return true
71 end
72 local qs = {} 69 local qs = {}
73 for i = 1, #dependencies do 70 for i = 1, #dependencies do
74 local parsed, err = queries.from_dep_string(dependencies[i]) 71 local parsed, err = queries.from_dep_string(dependencies[i])
@@ -153,19 +150,14 @@ function rockspecs.from_persisted_table(filename, rockspec, globals, quick)
153 150
154 rockspec.rocks_provided = util.get_rocks_provided(rockspec) 151 rockspec.rocks_provided = util.get_rocks_provided(rockspec)
155 152
156 local ok, err = convert_dependencies(rockspec.dependencies) 153 rockspec.dependencies = rockspec.dependencies or {}
157 if err then 154 rockspec.build_dependencies = rockspec.build_dependencies or {}
158 return nil, err 155 rockspec.test_dependencies = rockspec.test_dependencies or {}
159 end 156 for _, d in ipairs({ rockspec.dependencies, rockspec.build_dependencies, rockspec.test_dependencies }) do
160 157 local ok, err = convert_dependencies(d)
161 ok, err = convert_dependencies(rockspec.build_dependencies) 158 if err then
162 if err then 159 return nil, err
163 return nil, err 160 end
164 end
165
166 ok, err = convert_dependencies(rockspec.test_dependencies)
167 if err then
168 return nil, err
169 end 161 end
170 162
171 if rockspec.build and 163 if rockspec.build and