diff options
| author | ruki <[email protected]> | 2018-08-25 00:51:54 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2018-08-24 23:11:25 +0800 |
| commit | 3834432a2fa50afc439288a4f7862261aedf41ae (patch) | |
| tree | 6080893188bc4791e3044fa1b53f4c95a2e77ee9 /xmake/actions/require/package.lua | |
| parent | e00c2e6bbc3b363f191e514dc553ac6041fe2e0e (diff) | |
improve to load repo and package
Diffstat (limited to 'xmake/actions/require/package.lua')
| -rw-r--r-- | xmake/actions/require/package.lua | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xmake/actions/require/package.lua b/xmake/actions/require/package.lua index e48ce37fc..f111470ae 100644 --- a/xmake/actions/require/package.lua +++ b/xmake/actions/require/package.lua @@ -150,10 +150,10 @@ end function _load_package_from_repository(packagename, reponame) -- get package directory from the given package name - local packagedir, is_global = repository.packagedir(packagename, reponame) + local packagedir, repo = repository.packagedir(packagename, reponame) if packagedir then -- load it - return core_package.load_from_repository(packagename, is_global, packagedir) + return core_package.load_from_repository(packagename, repo, packagedir) end end @@ -219,8 +219,8 @@ function _search_package_from_repository(name) -- search package directories from the given package name local packages = {} - for packagename, packageinfo in pairs(repository.searchdirs(name)) do - local package = core_package.load_from_repository(packagename, packageinfo.is_global, packageinfo.packagedir) + for _, packageinfo in ipairs(repository.searchdirs(name)) do + local package = core_package.load_from_repository(packageinfo.name, packageinfo.repo, packageinfo.packagedir) if package then table.insert(packages, package) end |
