summaryrefslogtreecommitdiff
path: root/xmake/modules/private/action/require/impl/package.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2021-08-18 00:54:38 +0800
committerruki <[email protected]>2021-08-18 00:54:38 +0800
commitcfcd21ce456c3597573dd2f2324b236d4a84fcdd (patch)
tree3980fab6583b2f718fd232030c03a2a9ebe98055 /xmake/modules/private/action/require/impl/package.lua
parent723dca1ac294cccd66f5b3dd0661299fd197f476 (diff)
lock version
Diffstat (limited to 'xmake/modules/private/action/require/impl/package.lua')
-rw-r--r--xmake/modules/private/action/require/impl/package.lua16
1 files changed, 14 insertions, 2 deletions
diff --git a/xmake/modules/private/action/require/impl/package.lua b/xmake/modules/private/action/require/impl/package.lua
index fb84dea5f..627d5e70e 100644
--- a/xmake/modules/private/action/require/impl/package.lua
+++ b/xmake/modules/private/action/require/impl/package.lua
@@ -269,7 +269,19 @@ function _add_package_configurations(package)
end
-- select package version
-function _select_package_version(package, requireinfo)
+function _select_package_version(package, requireinfo, locked_requireinfo)
+
+ -- get it from the locked requireinfo
+ if locked_requireinfo then
+ local version = locked_requireinfo.version
+ local source = "version"
+ if locked_requireinfo.branch then
+ source = "branch"
+ elseif locked_requireinfo.tag then
+ source = "tag"
+ end
+ return version, source
+ end
-- exists urls? otherwise be phony package (only as package group)
if #package:urls() > 0 then
@@ -675,7 +687,7 @@ function _load_package(packagename, requireinfo, opt)
end
-- select package version
- local version, source = _select_package_version(package, requireinfo)
+ local version, source = _select_package_version(package, requireinfo, locked_requireinfo)
if version then
package:version_set(version, source)
end