summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2019-01-24 21:02:33 +0800
committerruki <[email protected]>2019-01-24 00:15:20 +0800
commit330b83f72c49ee3fb6d94b6550f10844532cfb73 (patch)
tree3c36f1148813db72fbae6f9663a187b3c15e3521
parentdd9e1bb88ec464edd6fa76a4ee63ad7a3a334314 (diff)
fix check semver
-rw-r--r--xmake/core/package/package.lua2
-rw-r--r--xmake/modules/package/manager/find_package.lua2
2 files changed, 2 insertions, 2 deletions
diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua
index 5ddc16117..19bbf5990 100644
--- a/xmake/core/package/package.lua
+++ b/xmake/core/package/package.lua
@@ -555,7 +555,7 @@ function _instance:fetch(opt)
-- fetch the require version
local require_ver = opt.version or self:requireinfo().version
- if require_ver == "lastest" then
+ if not require_ver:find('.', 1, true) then
require_ver = nil
end
diff --git a/xmake/modules/package/manager/find_package.lua b/xmake/modules/package/manager/find_package.lua
index 8f7a1a6cb..252a33e87 100644
--- a/xmake/modules/package/manager/find_package.lua
+++ b/xmake/modules/package/manager/find_package.lua
@@ -130,7 +130,7 @@ function _find_package(manager_name, package_name, opt)
-- check valid version
if result.version then
- local version = semver.new(result.version)
+ local version = try { function () return semver.new(result.version) end }
if version then
result.version = version:rawstr()
else