From 61eb867bf473a5e7254f2b841b66136e77f408cf Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 16 Nov 2020 23:12:16 +0800 Subject: fix xrepo search --- xmake/actions/require/impl/repository.lua | 12 ++++++++---- 1 file 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 -- cgit v1.3.1