summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2018-09-20 22:58:09 +0800
committerruki <[email protected]>2018-09-20 11:48:58 +0800
commitab631d5b0be6697d501aaa7e7cc3393dab343549 (patch)
treebed681d47fad8fbe0587eb0d50db364e9c020aaf
parenta2fdcffa422bdb47f763c157bd385418e2a5614e (diff)
improve to select package version
-rw-r--r--xmake/actions/require/package.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/xmake/actions/require/package.lua b/xmake/actions/require/package.lua
index 3b579bd3b..af4f0b553 100644
--- a/xmake/actions/require/package.lua
+++ b/xmake/actions/require/package.lua
@@ -332,10 +332,10 @@ function _select_packages_version(packages)
local source = nil
local version = nil
local require_version = package:requireinfo().version
- if require_version == "lastest" or require_version:find('.', 1, true) then -- select version?
+ if #package:versions() > 0 and (require_version == "lastest" or require_version:find('.', 1, true)) then -- select version?
version, source = semver.select(require_version, package:versions())
elseif has_giturl then -- select branch?
- version, source = require_version, "branches"
+ version, source = require_version ~= "lastest" and require_version or "master", "branches"
else
raise("package(%s %s): not found!", package:name(), require_version)
end