diff options
| author | ruki <[email protected]> | 2017-08-29 16:26:15 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2017-08-29 16:26:15 +0800 |
| commit | a08ffe4df25199ca038a768d5dfae96a2a54ee41 (patch) | |
| tree | dd05945addbcec3e2c71e6f490bfecf98e6184de | |
| parent | 9dc47dc2c48f4ce16261944d96ad6ce91b708eac (diff) | |
fix download trace info and require test
| -rw-r--r-- | tests/projects/requires/xmake.lua | 2 | ||||
| -rw-r--r-- | xmake/actions/require/action/download.lua | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/projects/requires/xmake.lua b/tests/projects/requires/xmake.lua index f96866d10..9d8852735 100644 --- a/tests/projects/requires/xmake.lua +++ b/tests/projects/requires/xmake.lua @@ -12,7 +12,7 @@ package_end() -- requires add_requires("zlib-mbedtls") -add_requires("[email protected] >=1.5.1 <1.6.1 optional") +add_requires("[email protected] ~1.6.0 optional") -- the debug mode if is_mode("debug") then diff --git a/xmake/actions/require/action/download.lua b/xmake/actions/require/action/download.lua index 1b32b6ec4..1b6192793 100644 --- a/xmake/actions/require/action/download.lua +++ b/xmake/actions/require/action/download.lua @@ -187,10 +187,11 @@ function main(package) end -- trace + printf("\r" .. _emptychars()) if git.checkurl(url) then - cprint("\r${yellow} => ${clear}clone %s %s .. ${red}failed%s", url, package:version_str(), _emptychars()) + cprint("\r${yellow} => ${clear}clone %s %s .. ${red}failed", url, package:version_str()) else - cprint("\r${yellow} => ${clear}download %s .. ${red}failed%s", url, _emptychars()) + cprint("\r${yellow} => ${clear}download %s .. ${red}failed", url) end -- failed? break it |