summaryrefslogtreecommitdiff
path: root/xmake/core/sandbox/modules/string.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2020-06-23 22:37:44 +0800
committerGitHub <[email protected]>2020-06-23 22:37:44 +0800
commitc18d15eb89116a0f3ce96bd56f3ccf861849f6ec (patch)
tree52b63db3274349f9a41872414208c7c30058cfd7 /xmake/core/sandbox/modules/string.lua
parent53df324acd9c7432336a5894ceef578daa1ce38d (diff)
parent18bded45c229f5580c13fc8b4afc5edb6f18819a (diff)
Merge pull request #857 from xmake-io/toolchain
Improve toolchain to support host and cross toolchains at same time
Diffstat (limited to 'xmake/core/sandbox/modules/string.lua')
-rw-r--r--xmake/core/sandbox/modules/string.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/xmake/core/sandbox/modules/string.lua b/xmake/core/sandbox/modules/string.lua
index 36f2f7b58..755b12fba 100644
--- a/xmake/core/sandbox/modules/string.lua
+++ b/xmake/core/sandbox/modules/string.lua
@@ -48,7 +48,7 @@ function sandbox_string.vformat(format, ...)
if #{...} > 0 then
-- escape "%$", "%(", "%)", "%%" to '$', '(', ')', '%%'
- format = format:gsub("%%([%$%(%)%%])", function (ch) return utils.ifelse(ch ~= "%", "%%" .. ch, "%%%%") end)
+ format = format:gsub("%%([%$%(%)%%])", function (ch) return ch ~= "%" and ("%%" .. ch) or "%%%%" end)
-- try to format it
result = string.format(format, ...)