uci:get_list: always return a table, no matter what.

Previously, get_list("fake", "non-existent", "notreal") would still
return a table, just empty.  This is nice, as you can always iterate the
returned table, without having to check it first.

However, if you happened to pass a nil for any of the parameters, you
would actually get a nil in return.  This was inconsistent.

The documentation is updated to clarify the behaviour of this function.

Signed-off-by: Karl Palsson <karlp@remake.is>

diff --git a/modules/luci-base/luasrc/model/uci.lua b/modules/luci-base/luasrc/model/uci.lua
index e9bac6ec03d10bdd5e4b39d4df6d0fd9459932af..577c6cde08eaa6e10887c97b26fed000f3289070 100644 (file)
--- a/modules/luci-base/luasrc/model/uci.lua
+++ b/modules/luci-base/luasrc/model/uci.lua
@@ -111,7 +111,7 @@ function Cursor.get_list(self, config, section, option)
                local val = self:get(config, section, option)
                return ( type(val) == "table" and val or { val } )
        end
-       return nil
+       return {}
 end
 
 function Cursor.get_first(self, conf, stype, opt, def)

diff --git a/modules/luci-base/luasrc/model/uci.luadoc b/modules/luci-base/luasrc/model/uci.luadoc
index f3aa609d59da1cac62f4c0857eb7ad5811c37e11..9e4a58f1d901f169cd684789fc4da1737b3e387a 100644 (file)
--- a/modules/luci-base/luasrc/model/uci.luadoc
+++ b/modules/luci-base/luasrc/model/uci.luadoc
@@ -88,7 +88,8 @@ Get an option or list and return values as table.
 @param config  UCI config
 @param section UCI section name
 @param option  UCI option
-@return                        UCI value
+@return                table.  If the option was not found, you will simply get
+--             an empty table.
 ]]
 
 ---[[