summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2020-11-16 23:12:16 +0800
committerruki <[email protected]>2020-11-16 23:12:16 +0800
commit61eb867bf473a5e7254f2b841b66136e77f408cf (patch)
tree493beac9323933e6734b0124ae8de9c58659ef9f
parent16ccffab94c9d15ee03ad5cac4e37566e81279bb (diff)
fix xrepo search
-rw-r--r--xmake/actions/require/impl/repository.lua12
1 files changed, 8 insertions, 4 deletions
diff --git a/xmake/actions/require/impl/repository.lua b/xmake/actions/require/impl/repository.lua
index 7e9af63b1..63f42a842 100644
--- a/xmake/actions/require/impl/repository.lua
+++ b/xmake/actions/require/impl/repository.lua
@@ -97,10 +97,14 @@ function searchdirs(name)
local packageinfos = {}
for _, repo in ipairs(repositories()) do
for _, file in ipairs(os.files(path.join(repo:directory(), "packages", "*", string.ipattern("*" .. name .. "*"), "xmake.lua"))) do
- local packagename = path.basename(path.directory(file))
- if not unique[packagename] then
- table.insert(packageinfos, {name = packagename, repo = repo, packagedir = path.directory(file)})
- unique[packagename] = true
+ local dir = path.directory(file)
+ local subdirname = path.basename(path.directory(dir))
+ if #subdirname == 1 then -- ignore l/luajit/port/xmake.lua
+ local packagename = path.basename(dir)
+ if not unique[packagename] then
+ table.insert(packageinfos, {name = packagename, repo = repo, packagedir = path.directory(file)})
+ unique[packagename] = true
+ end
end
end
end