From b40bc697d9ce4e20836b60941daabfeaae080b28 Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Thu, 3 Aug 2017 09:09:17 +0800
Subject: improve errors tips

---
 xmake/core/sandbox/modules/os.lua | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'xmake/core/sandbox/modules/os.lua')

diff --git a/xmake/core/sandbox/modules/os.lua b/xmake/core/sandbox/modules/os.lua
index adeb2874f..839d5cbba 100644
--- a/xmake/core/sandbox/modules/os.lua
+++ b/xmake/core/sandbox/modules/os.lua
@@ -302,7 +302,11 @@ function sandbox_os.iorun(cmd, ...)
     -- run it
     local ok, outdata, errdata = os.iorun(cmd)
     if not ok then
-        os.raise((outdata or "") .. (errdata or ""))
+        local errors = errdata or ""
+        if #errors:trim() == 0 then
+            errors = outdata or ""
+        end
+        os.raise(errors)
     end
 
     -- ok
@@ -318,7 +322,11 @@ function sandbox_os.iorunv(program, argv)
     -- run it
     local ok, outdata, errdata = os.iorunv(program, argv)
     if not ok then
-        os.raise((outdata or "") .. (errdata or ""))
+        local errors = errdata or ""
+        if #errors:trim() == 0 then
+            errors = outdata or ""
+        end
+        os.raise(errors)
     end
 
     -- ok
-- 
cgit v1.3.1