From: Jo-Philipp Wich <jo@mein.io>
Date: Wed, 6 Jun 2018 19:44:12 +0000 (+0200)
Subject: luci-base: fix some minor luci.model.uci issues
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7be3f0400c95f810651e7e8c70add589176ae04b;p=oweals%2Fluci.git

luci-base: fix some minor luci.model.uci issues

 - Properly serialize option delete changelogs
 - Do not perform a section create if a nil value is passed to set()

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/modules/luci-base/luasrc/model/uci.lua b/modules/luci-base/luasrc/model/uci.lua
index 461ba9d5a..92c0d8f69 100644
--- a/modules/luci-base/luasrc/model/uci.lua
+++ b/modules/luci-base/luasrc/model/uci.lua
@@ -8,7 +8,7 @@ local table = require "table"
 
 local setmetatable, rawget, rawset = setmetatable, rawget, rawset
 local require, getmetatable, assert = require, getmetatable, assert
-local error, pairs, ipairs = error, pairs, ipairs
+local error, pairs, ipairs, select = error, pairs, ipairs, select
 local type, tostring, tonumber, unpack = type, tostring, tonumber, unpack
 
 -- The typical workflow for UCI is:  Get a cursor instance from the
@@ -106,7 +106,7 @@ function changes(self, config)
 			local _, change
 			for _, change in ipairs(changes) do
 				local operation, section, option, value = unpack(change)
-				if option and value and operation ~= "add" then
+				if option and operation ~= "add" then
 					res[package][section] = res[package][section] or { }
 
 					if operation == "list-add" then
@@ -373,15 +373,15 @@ function add(self, config, stype)
 	return self:section(config, stype)
 end
 
-function set(self, config, section, option, value)
-	if value == nil then
+function set(self, config, section, option, ...)
+	if select('#', ...) == 0 then
 		local sname, err = self:section(config, option, section)
 		return (not not sname), err
 	else
 		local _, err = call("set", {
 			config  = config,
 			section = section,
-			values  = { [option] = value }
+			values  = { [option] = select(1, ...) }
 		})
 		return (err == nil), ERRSTR[err]
 	end