aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHisham Muhammad <hisham@gobolinux.org>2020-09-23 15:24:58 -0300
committerGitHub <noreply@github.com>2020-09-23 15:24:58 -0300
commitdf45e3273ff1265ff8822187033b82911c79fb60 (patch)
tree2a43aeb7f91066a70af30bd1fa2009aaec6ae773
parent0cf93c431c5ff251324c7f6b875d9d56feeb3cad (diff)
downloadluarocks-df45e3273ff1265ff8822187033b82911c79fb60.tar.gz
luarocks-df45e3273ff1265ff8822187033b82911c79fb60.tar.bz2
luarocks-df45e3273ff1265ff8822187033b82911c79fb60.zip
manif: keep scanning on non-default trees (#1227)
-rw-r--r--src/luarocks/core/manif.lua24
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
112end 112end