summaryrefslogtreecommitdiff
path: root/xmake/modules/private/action/require/impl/package.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2021-08-18 00:53:03 +0800
committerruki <[email protected]>2021-08-18 00:53:03 +0800
commit723dca1ac294cccd66f5b3dd0661299fd197f476 (patch)
treefdcce708c72ccf1ea8fc008573616fdf8bea3d9a /xmake/modules/private/action/require/impl/package.lua
parent00107046b0c8eb07185b24783b2d32114f9ed760 (diff)
improve version source
Diffstat (limited to 'xmake/modules/private/action/require/impl/package.lua')
-rw-r--r--xmake/modules/private/action/require/impl/package.lua12
1 files changed, 6 insertions, 6 deletions
diff --git a/xmake/modules/private/action/require/impl/package.lua b/xmake/modules/private/action/require/impl/package.lua
index 53e978f9a..fb84dea5f 100644
--- a/xmake/modules/private/action/require/impl/package.lua
+++ b/xmake/modules/private/action/require/impl/package.lua
@@ -293,12 +293,12 @@ function _select_package_version(package, requireinfo)
-- @see https://github.com/xmake-io/xmake/issues/930
-- https://github.com/xmake-io/xmake/issues/1009
version = require_version
- source = "versions"
+ source = "version"
elseif #package:versions() > 0 then -- select version?
version, source = try { function () return semver.select(require_version, package:versions()) end }
end
if not version and has_giturl and not require_version:find('.', 1, true) then -- select branch?
- version, source = require_version ~= "latest" and require_version or "master", "branches"
+ version, source = require_version ~= "latest" and require_version or "master", "branch"
end
if not version then
raise("package(%s): version(%s) not found!", package:name(), require_version)
@@ -667,12 +667,12 @@ function _load_package(packagename, requireinfo, opt)
-- finish requireinfo
_finish_requireinfo(requireinfo, package)
- --[[
- -- get requirekey
+ -- get locked requireinfo
+ local locked_requireinfo
if _has_locked_requires() then
local requirekey = _get_packagelock_key(requireinfo)
- print("requirekey", requirekey)
- end]]
+ locked_requireinfo = _get_locked_requires(requirekey)
+ end
-- select package version
local version, source = _select_package_version(package, requireinfo)