From a08ffe4df25199ca038a768d5dfae96a2a54ee41 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 29 Aug 2017 16:26:15 +0800 Subject: fix download trace info and require test --- tests/projects/requires/xmake.lua | 2 +- 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("xmake-repo@tboox.tbox >=1.5.1 <1.6.1 optional") +add_requires("xmake-repo@tboox.tbox ~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 -- cgit v1.3.1