diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2024-08-23 22:21:11 -0300 |
---|---|---|
committer | Hisham Muhammad <hisham@gobolinux.org> | 2024-08-23 22:21:11 -0300 |
commit | e55295dd335636f9d55c1cc5d6a111fb3d4c56cf (patch) | |
tree | 924f96c9d8f354a8338c624ec60aea07b193b230 | |
parent | 581f12009de44f5ddae7f5edc5671e44f7803099 (diff) | |
download | luarocks-teal-write-rockspec.tar.gz luarocks-teal-write-rockspec.tar.bz2 luarocks-teal-write-rockspec.zip |
deps: fix: re-enable constraint check for no_upgrade flagteal-write-rockspec
-rw-r--r-- | src/luarocks/deps.lua | 16 | ||||
-rw-r--r-- | src/luarocks/deps.tl | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua index a7b091b3..405a31ef 100644 --- a/src/luarocks/deps.lua +++ b/src/luarocks/deps.lua | |||
@@ -333,14 +333,14 @@ function deps.fulfill_dependencies(rockspec, depskey, deps_mode, verify, deplock | |||
333 | if okfulfill then | 333 | if okfulfill then |
334 | deplocks.add(depskey, depq.name, found_or_err) | 334 | deplocks.add(depskey, depq.name, found_or_err) |
335 | else | 335 | else |
336 | 336 | if depq.constraints and depq.constraints[1] and depq.constraints[1].no_upgrade then | |
337 | 337 | util.printerr("This version of " .. name .. " is designed for use with") | |
338 | 338 | util.printerr(tostring(depq) .. ", but is configured to avoid upgrading it") | |
339 | 339 | util.printerr("automatically. Please upgrade " .. depq.name .. " with") | |
340 | 340 | util.printerr(" luarocks install " .. depq.name) | |
341 | 341 | util.printerr("or look for a suitable version of " .. name .. " with") | |
342 | 342 | util.printerr(" luarocks search " .. name) | |
343 | 343 | end | |
344 | return nil, found_or_err | 344 | return nil, found_or_err |
345 | end | 345 | end |
346 | end | 346 | end |
diff --git a/src/luarocks/deps.tl b/src/luarocks/deps.tl index 572649db..1911f8f9 100644 --- a/src/luarocks/deps.tl +++ b/src/luarocks/deps.tl | |||
@@ -333,14 +333,14 @@ function deps.fulfill_dependencies(rockspec: Rockspec, depskey: DepsKey, deps_mo | |||
333 | if okfulfill then | 333 | if okfulfill then |
334 | deplocks.add(depskey, depq.name, found_or_err) | 334 | deplocks.add(depskey, depq.name, found_or_err) |
335 | else | 335 | else |
336 | -- if no_upgrade then | 336 | if depq.constraints and depq.constraints[1] and depq.constraints[1].no_upgrade then |
337 | -- util.printerr("This version of "..name.." is designed for use with") | 337 | util.printerr("This version of "..name.." is designed for use with") |
338 | -- util.printerr(tostring(dep)..", but is configured to avoid upgrading it") | 338 | util.printerr(tostring(depq)..", but is configured to avoid upgrading it") |
339 | -- util.printerr("automatically. Please upgrade "..dep.name.." with") | 339 | util.printerr("automatically. Please upgrade "..depq.name.." with") |
340 | -- util.printerr(" luarocks install "..dep.name) | 340 | util.printerr(" luarocks install "..depq.name) |
341 | -- util.printerr("or look for a suitable version of "..name.." with") | 341 | util.printerr("or look for a suitable version of "..name.." with") |
342 | -- util.printerr(" luarocks search "..name) | 342 | util.printerr(" luarocks search "..name) |
343 | -- end | 343 | end |
344 | return nil, found_or_err | 344 | return nil, found_or_err |
345 | end | 345 | end |
346 | end | 346 | end |