From 0e681d5c37c58fba935fa1f6b99cfc619c0d629c Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 4 May 2020 23:38:22 +0200
Subject: [PATCH] gluon-core: util: avoid unintended second return value from
gsub()
gsub() returns the number of matches as its second return value. This
was unintendedly passed through by the util functions trim() and
node_id(). It can be presumed that this had no effect in practice, but
it can lead to surprising output when passing values to print() for
debugging.
---
package/gluon-core/luasrc/usr/lib/lua/gluon/util.lua | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/gluon-core/luasrc/usr/lib/lua/gluon/util.lua b/package/gluon-core/luasrc/usr/lib/lua/gluon/util.lua
index 995443689..bd51fcc46 100644
--- a/package/gluon-core/luasrc/usr/lib/lua/gluon/util.lua
+++ b/package/gluon-core/luasrc/usr/lib/lua/gluon/util.lua
@@ -23,7 +23,7 @@ local function do_filter_prefix(input, output, prefix)
end
function M.trim(str)
- return str:gsub("^%s*(.-)%s*$", "%1")
+ return (str:gsub("^%s*(.-)%s*$", "%1"))
end
function M.contains(table, value)
@@ -96,7 +96,7 @@ function M.exec(command)
end
function M.node_id()
- return string.gsub(sysconfig.primary_mac, ':', '')
+ return (string.gsub(sysconfig.primary_mac, ':', ''))
end
function M.default_hostname()
--
GitLab