From 0263e1281a560bb931074d8944507d4bf7bcd407 Mon Sep 17 00:00:00 2001
From: erw7 <erw7.github@gmail.com>
Date: Fri, 24 Sep 2021 11:21:34 +0900
Subject: fix check_external_dependency_at (#1355)
Fix a problem where 'files' were being sorted even though they should have
been inspected in the order of external_deps_patterns.
---
src/luarocks/deps.lua | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index 5b02c68b..63803374 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -373,7 +373,7 @@ end
-- @param files The array of constructed names
local function add_all_patterns(file, patterns, files)
for _, pattern in ipairs(patterns) do
- table.insert(files, (pattern:gsub("?", file)))
+ table.insert(files, {#files + 1, (pattern:gsub("?", file))})
end
end
@@ -425,7 +425,7 @@ local function add_patterns_for_file(files, file, patterns)
add_all_patterns(matched, patterns, files)
end
end
- table.insert(files, file)
+ table.insert(files, {#files + 1, file})
end
end
@@ -460,16 +460,17 @@ local function check_external_dependency_at(prefix, name, ext_files, vars, dirs,
local found = false
table.sort(files, function(a, b)
- if (not a:match("%*")) and b:match("%*") then
+ if (not a[2]:match("%*")) and b[2]:match("%*") then
return true
- elseif a:match("%*") and (not b:match("%*")) then
+ elseif a[2]:match("%*") and (not b[2]:match("%*")) then
return false
else
- return a < b
+ return a[1] < b[1]
end
end)
- for _, f in ipairs(files) do
+ for _, fa in ipairs(files) do
+ f = fa[2]
-- small convenience hack
if f:match("%.so$") or f:match("%.dylib$") or f:match("%.dll$") then
f = f:gsub("%.[^.]+$", "."..cfg.external_lib_extension)
--
cgit v1.2.3-55-g6feb