From a03b23a54a6b471238ac565aa92248d805bd642c Mon Sep 17 00:00:00 2001 From: Hisham Date: Mon, 31 Oct 2016 03:02:57 -0200 Subject: Fix merge of rocks_provided [2]. This is now a parameter, because depending on the rockspec version the set of default rocks_provided for a rockspec may change. This is to maintain compatibility with rocks provided by LuaRocks versions in rockspec format 1.0. When checking dependencies for a rockspec, we ensure we respect that to keep backward compatibility. When we check dependencies for the manifest as a whole, we can use the larger set of rocks_provided known by the current LuaRocks version. --- src/luarocks/manif/writer.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/luarocks/manif/writer.lua b/src/luarocks/manif/writer.lua index 42b92e17..5ab3917b 100644 --- a/src/luarocks/manif/writer.lua +++ b/src/luarocks/manif/writer.lua @@ -427,7 +427,7 @@ function writer.check_dependencies(repo, deps_mode) for _, entry in ipairs(version_entries) do if entry.arch == "installed" then if manifest.dependencies[name] and manifest.dependencies[name][version] then - deps.report_missing_dependencies(name, version, manifest.dependencies[name][version], deps_mode) + deps.report_missing_dependencies(name, version, manifest.dependencies[name][version], deps_mode, cfg.rocks_provided_3_0) end end end -- cgit v1.2.3-55-g6feb