From 1b11965798c552d338e708595ebc6e944711cd40 Mon Sep 17 00:00:00 2001 From: Paul Reilly Date: Thu, 17 Sep 2020 16:44:27 +0100 Subject: fix returning found package manager, tidy assembling log message --- xmake/modules/package/manager/find_package.lua | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'xmake/modules/package/manager/find_package.lua') diff --git a/xmake/modules/package/manager/find_package.lua b/xmake/modules/package/manager/find_package.lua index 6a3336cc9..93f7c8447 100644 --- a/xmake/modules/package/manager/find_package.lua +++ b/xmake/modules/package/manager/find_package.lua @@ -64,16 +64,17 @@ function _find_package_with_builtin_rule(package_name, opt) end -- find package from the given package manager - local result, manager_name = nil, nil + local result = nil + local found_manager_name = nil for _, manager_name in ipairs(managers) do dprint("finding %s from %s ..", package_name, manager_name) result = import("package.manager." .. manager_name .. ".find_package", {anonymous = true})(package_name, opt) if result then + found_manager_name = manager_name break end - manager_name = nil end - return result, manager_name + return result, found_manager_name end -- find package @@ -146,6 +147,7 @@ end -- -- @endcode -- + function main(name, opt) -- get the copied options @@ -169,7 +171,7 @@ function main(name, opt) opt.version = require_version or opt.version -- find package - local found_manager_name + local found_manager_name = nil result, found_manager_name = _find_package(manager_name, package_name, opt) -- match version? @@ -180,5 +182,5 @@ function main(name, opt) end -- ok? - return result, found_manager_name, package_name, manager_name + return result, found_manager_name, package_name end -- cgit v1.3.1