diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2020-09-23 12:39:49 -0300 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2020-09-23 13:08:13 -0300 |
| commit | f698437a8038c9c1cc0ce4ce753f63af533cc0ce (patch) | |
| tree | 2a43aeb7f91066a70af30bd1fa2009aaec6ae773 /src | |
| parent | 0cf93c431c5ff251324c7f6b875d9d56feeb3cad (diff) | |
| download | luarocks-f698437a8038c9c1cc0ce4ce753f63af533cc0ce.tar.gz luarocks-f698437a8038c9c1cc0ce4ce753f63af533cc0ce.tar.bz2 luarocks-f698437a8038c9c1cc0ce4ce753f63af533cc0ce.zip | |
manif: keep scanning on non-default trees
Diffstat (limited to 'src')
| -rw-r--r-- | src/luarocks/core/manif.lua | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/luarocks/core/manif.lua b/src/luarocks/core/manif.lua index 1e9da75e..fe0a95fa 100644 --- a/src/luarocks/core/manif.lua +++ b/src/luarocks/core/manif.lua | |||
| @@ -91,22 +91,22 @@ function manif.scan_dependencies(name, version, tree_manifests, dest) | |||
| 91 | if manifest.dependencies and manifest.dependencies[name] then | 91 | if manifest.dependencies and manifest.dependencies[name] then |
| 92 | pkgdeps = manifest.dependencies[name][version] | 92 | pkgdeps = manifest.dependencies[name][version] |
| 93 | end | 93 | end |
| 94 | if not pkgdeps then | 94 | if pkgdeps then |
| 95 | return nil | 95 | for _, dep in ipairs(pkgdeps) do |
| 96 | end | 96 | local pkg, constraints = dep.name, dep.constraints |
| 97 | for _, dep in ipairs(pkgdeps) do | 97 | |
| 98 | local pkg, constraints = dep.name, dep.constraints | 98 | for _, t in ipairs(tree_manifests) do |
| 99 | 99 | local entries = t.manifest.repository[pkg] | |
| 100 | for _, t in ipairs(tree_manifests) do | 100 | if entries then |
| 101 | local entries = t.manifest.repository[pkg] | 101 | for ver, _ in util.sortedpairs(entries, vers.compare_versions) do |
| 102 | if entries then | 102 | if (not constraints) or vers.match_constraints(vers.parse_version(ver), constraints) then |
| 103 | for ver, _ in util.sortedpairs(entries, vers.compare_versions) do | 103 | manif.scan_dependencies(pkg, ver, tree_manifests, dest) |
| 104 | if (not constraints) or vers.match_constraints(vers.parse_version(ver), constraints) then | 104 | end |
| 105 | manif.scan_dependencies(pkg, ver, tree_manifests, dest) | ||
| 106 | end | 105 | end |
| 107 | end | 106 | end |
| 108 | end | 107 | end |
| 109 | end | 108 | end |
| 109 | return | ||
| 110 | end | 110 | end |
| 111 | end | 111 | end |
| 112 | end | 112 | end |