From ca574535f2135da88b10946577e43d711b868cc8 Mon Sep 17 00:00:00 2001 From: Hisham Date: Mon, 31 Oct 2016 02:59:35 -0200 Subject: Fix merge of rocks_provided. 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/deps.lua | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua index 9c737d66..1c75a694 100644 --- a/src/luarocks/deps.lua +++ b/src/luarocks/deps.lua @@ -147,7 +147,7 @@ end -- @param dep table: A dependency parsed in table format. -- @param blacklist table: Versions that can't be accepted. Table where keys -- are program versions and values are 'true'. --- @param provided table: A table of auto-dependencies provided +-- @param rocks_provided table: A table of auto-dependencies provided -- by this Lua implementation for the given dependency. -- @return string or nil: latest installed version of the rock matching the dependency -- or nil if it could not be matched. @@ -235,19 +235,21 @@ end -- @param version string: package version. -- @param dependencies table: array of dependencies. -- @param deps_mode string: Which trees to check dependencies for: +-- @param rocks_provided table: A table of auto-dependencies provided +-- by this Lua implementation for the given dependency. -- "one" for the current default tree, "all" for all trees, -- "order" for all trees with priority >= the current default, "none" for no trees. -function deps.report_missing_dependencies(name, version, dependencies, deps_mode) +function deps.report_missing_dependencies(name, version, dependencies, deps_mode, rocks_provided) local first_missing_dep = true for _, dep in ipairs(dependencies) do - if not match_dep(dep, nil, deps_mode) then + if not match_dep(dep, nil, deps_mode, rocks_provided) then if first_missing_dep then util.printout(("Missing dependencies for %s %s:"):format(name, version)) first_missing_dep = false end - util.printout((" %s (%s)"):format(deps.show_dep(dep), rock_status(dep.name, deps_mode))) + util.printout((" %s (%s)"):format(deps.show_dep(dep), rock_status(dep.name, deps_mode, rocks_provided))) end end end @@ -292,7 +294,7 @@ function deps.fulfill_dependencies(rockspec, deps_mode) end end - deps.report_missing_dependencies(rockspec.name, rockspec.version, rockspec.dependencies, deps_mode) + deps.report_missing_dependencies(rockspec.name, rockspec.version, rockspec.dependencies, deps_mode, rockspec.rocks_provided) local first_missing_dep = true -- cgit v1.2.3-55-g6feb