diff options
| author | ruki <[email protected]> | 2017-09-14 00:33:00 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2017-09-13 21:18:02 +0800 |
| commit | d0ab158cac68ffc22396c8d9a83624625ca05f7c (patch) | |
| tree | bfee14c99d0a4077ffdd0a1ddf1025cc6ea71c9d /xmake/actions/require/package.lua | |
| parent | b1af9888679f0ac9384bba23a1b9d99d7b165db8 (diff) | |
improve semver satisfies
Diffstat (limited to 'xmake/actions/require/package.lua')
| -rw-r--r-- | xmake/actions/require/package.lua | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xmake/actions/require/package.lua b/xmake/actions/require/package.lua index 9df334a6e..172d60797 100644 --- a/xmake/actions/require/package.lua +++ b/xmake/actions/require/package.lua @@ -163,8 +163,9 @@ function _load_package(packagename, requireinfo) if instance then -- satisfy required version? - if not semver.satisfies(instance:version(), requireinfo.version) then - raise("package(%s): version conflict, '%s' does not satisfy '%s'!", packagename, instance:version(), requireinfo.version) + local version_str = instance:version_str() + if version_str and not semver.satisfies(version_str, requireinfo.version) then + raise("package(%s): version conflict, '%s' does not satisfy '%s'!", packagename, version_str, requireinfo.version) end -- ok |