summaryrefslogtreecommitdiff
path: root/xmake/actions/require/impl
diff options
context:
space:
mode:
authorruki <[email protected]>2019-01-29 22:38:16 +0800
committerruki <[email protected]>2019-01-29 09:49:37 +0800
commitf0efa9f471824ead88a98ca8cf3387c88606e051 (patch)
tree39c3821d35aeb8342b744225e9b377ae525ddcf7 /xmake/actions/require/impl
parent2a8b05d146a9fd53aa5784e36dca45cbce2ce272 (diff)
fix load requires with alias
Diffstat (limited to 'xmake/actions/require/impl')
-rw-r--r--xmake/actions/require/impl/action/download.lua2
-rw-r--r--xmake/actions/require/impl/action/install.lua8
-rw-r--r--xmake/actions/require/impl/package.lua4
3 files changed, 7 insertions, 7 deletions
diff --git a/xmake/actions/require/impl/action/download.lua b/xmake/actions/require/impl/action/download.lua
index 940ef4d5c..a01d9aef2 100644
--- a/xmake/actions/require/impl/action/download.lua
+++ b/xmake/actions/require/impl/action/download.lua
@@ -206,7 +206,7 @@ function main(package)
function (errors)
-- verbose?
- if option.get("verbose") and errors then
+ if (option.get("verbose") or option.get("diagnosis")) and errors then
cprint("${dim color.error}error: ${clear}%s", errors)
end
diff --git a/xmake/actions/require/impl/action/install.lua b/xmake/actions/require/impl/action/install.lua
index 07fd34e02..181bded44 100644
--- a/xmake/actions/require/impl/action/install.lua
+++ b/xmake/actions/require/impl/action/install.lua
@@ -59,7 +59,7 @@ function main(package)
-- trace
cprintf("${yellow} => ${clear}installing %s .. ", tipname)
- if option.get("verbose") then
+ if option.get("verbose") or option.get("diagnosis") then
print("")
end
@@ -118,7 +118,7 @@ function main(package)
end
-- install package
- if option.get("verbose") then
+ if option.get("verbose") or option.get("diagnosis") then
installtask()
else
process.asyncrun(installtask)
@@ -126,7 +126,7 @@ function main(package)
-- fetch package and force to flush the cache
local fetchinfo = package:fetch({force = true})
- if option.get("verbose") then
+ if option.get("verbose") or option.get("diagnosis") then
print(fetchinfo)
end
assert(fetchinfo, "fetch %s failed!", tipname)
@@ -140,7 +140,7 @@ function main(package)
function (errors)
-- verbose?
- if option.get("verbose") and errors then
+ if (option.get("verbose") or option.get("diagnosis")) and errors then
cprint("${dim color.error}error: ${clear}%s", errors)
end
diff --git a/xmake/actions/require/impl/package.lua b/xmake/actions/require/impl/package.lua
index 607c1a9ae..d362563a4 100644
--- a/xmake/actions/require/impl/package.lua
+++ b/xmake/actions/require/impl/package.lua
@@ -480,10 +480,10 @@ function install_packages(requires, opt)
action.download(package)
end
- end, #packages_download, ifelse(option.get("verbose"), 1, 4), 300, function (indices)
+ end, #packages_download, ifelse((option.get("verbose") or option.get("diagnosis")), 1, 4), 300, function (indices)
-- do not print progress info if be verbose
- if option.get("verbose") then
+ if option.get("verbose") or option.get("diagnosis") then
return
end