diff options
| author | Hisham <hisham@gobolinux.org> | 2016-10-31 03:02:57 -0200 |
|---|---|---|
| committer | Hisham <hisham@gobolinux.org> | 2016-10-31 03:03:16 -0200 |
| commit | a03b23a54a6b471238ac565aa92248d805bd642c (patch) | |
| tree | 72eb572e558a584436f4573e0927b4287454287c /src | |
| parent | ca574535f2135da88b10946577e43d711b868cc8 (diff) | |
| download | luarocks-a03b23a54a6b471238ac565aa92248d805bd642c.tar.gz luarocks-a03b23a54a6b471238ac565aa92248d805bd642c.tar.bz2 luarocks-a03b23a54a6b471238ac565aa92248d805bd642c.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/luarocks/manif/writer.lua | 2 |
1 files changed, 1 insertions, 1 deletions
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) | |||
| 427 | for _, entry in ipairs(version_entries) do | 427 | for _, entry in ipairs(version_entries) do |
| 428 | if entry.arch == "installed" then | 428 | if entry.arch == "installed" then |
| 429 | if manifest.dependencies[name] and manifest.dependencies[name][version] then | 429 | if manifest.dependencies[name] and manifest.dependencies[name][version] then |
| 430 | deps.report_missing_dependencies(name, version, manifest.dependencies[name][version], deps_mode) | 430 | deps.report_missing_dependencies(name, version, manifest.dependencies[name][version], deps_mode, cfg.rocks_provided_3_0) |
| 431 | end | 431 | end |
| 432 | end | 432 | end |
| 433 | end | 433 | end |
