aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHisham Muhammad <hisham@gobolinux.org>2024-08-06 16:50:23 -0300
committerHisham Muhammad <hisham@gobolinux.org>2024-08-06 16:50:23 -0300
commitbe39f1507a7b936ed48bc71ea22ccde8af4ba97a (patch)
tree350fd57a2db6d394ebbde19714a318f370fa5013
parentd8c414c18467205bb6c6bca9fd316fc0e055c005 (diff)
downloadluarocks-teal-convert-dependencies-2.tar.gz
luarocks-teal-convert-dependencies-2.tar.bz2
luarocks-teal-convert-dependencies-2.zip
fix: ensure dependencies and .queries always existteal-convert-dependencies-2
-rw-r--r--src/luarocks/rockspecs.tl24
1 files changed, 8 insertions, 16 deletions
diff --git a/src/luarocks/rockspecs.tl b/src/luarocks/rockspecs.tl
index ab946e97..01f6c79e 100644
--- a/src/luarocks/rockspecs.tl
+++ b/src/luarocks/rockspecs.tl
@@ -66,9 +66,6 @@ local function platform_overrides(tbl?: {any: any})
66end 66end
67 67
68local function convert_dependencies(dependencies: Dependencies): boolean, string 68local function convert_dependencies(dependencies: Dependencies): boolean, string
69 if not dependencies then
70 return true
71 end
72 local qs: {Query} = {} 69 local qs: {Query} = {}
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: string, rockspec: Rockspec, gl
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 163 if rockspec.build