diff options
| author | ruki <[email protected]> | 2022-11-14 21:32:28 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-11-14 21:32:28 +0800 |
| commit | 6a293455158e8cf5a30796791b591d7e71746433 (patch) | |
| tree | 129380604def396cf4635209e7e77ede4ce4a561 | |
| parent | 7ca26dbb5605cfdb5640c9f79fcbff677af161bc (diff) | |
| parent | 92303dfd80926f12deaba98aaba67c5c66a35fef (diff) | |
Merge pull request #3059 from SirLynix/patch-12
Allow package on_fetch to return false to disable xmake find
| -rw-r--r-- | xmake/core/package/package.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua index 3ce5395a2..4bb80ebd5 100644 --- a/xmake/core/package/package.lua +++ b/xmake/core/package/package.lua @@ -1430,7 +1430,7 @@ function _instance:_fetch_tool(opt) fetchinfo = on_fetch(self, {force = opt.force, system = opt.system, require_version = opt.require_version}) - if opt.require_version and opt.require_version:find(".", 1, true) then + if fetchinfo and opt.require_version and opt.require_version:find(".", 1, true) then local version = type(fetchinfo) == "table" and fetchinfo.version if not (version and (version == opt.require_version or semver.satisfies(version, opt.require_version))) then fetchinfo = nil @@ -1479,8 +1479,8 @@ function _instance:_fetch_library(opt) system = opt.system, external = opt.external, require_version = opt.require_version}) - if opt.require_version and opt.require_version:find(".", 1, true) then - local version = fetchinfo and fetchinfo.version + if fetchinfo and opt.require_version and opt.require_version:find(".", 1, true) then + local version = fetchinfo.version if not (version and (version == opt.require_version or semver.satisfies(version, opt.require_version))) then fetchinfo = nil end |