* luci/libs/uvl: more sensitive checking of error reasons in evaluation of option...

diff --git a/libs/uvl/luasrc/uvl.lua b/libs/uvl/luasrc/uvl.lua
index 1e9bea4a46702d41111591d80d0668bf04977899..3963a64be3f8d2f867da05c2e4e4640236786d14 100644 (file)
--- a/libs/uvl/luasrc/uvl.lua
+++ b/libs/uvl/luasrc/uvl.lua
@@ -295,9 +295,8 @@ function UVL._validate_option( self, option, nodeps )
                if not nodeps then
                        local ok, err = dependencies.check( self, option )
                        if not ok then
-                               -- XXX: maybe this needs to be more specific
-                               if not err:is(ERR.ERR_DEP_NOTEQUAL) and
-                                  not err:is(ERR.ERR_DEP_NOVALUE)
+                               if not err:is_all(ERR.ERR_DEP_NOTEQUAL) and
+                                  not err:is_all(ERR.ERR_DEP_NOVALUE)
                                then
                                        option:error(err)
                                        return false, option:errors()

diff --git a/libs/uvl/luasrc/uvl/dependencies.lua b/libs/uvl/luasrc/uvl/dependencies.lua
index d19149e7ab2a9a0f80a4e18cf0ce444c66f768d4..5b67dffe4ae28af2eab16e0f40c19de05fc513e0 100644 (file)
--- a/libs/uvl/luasrc/uvl/dependencies.lua
+++ b/libs/uvl/luasrc/uvl/dependencies.lua
@@ -37,7 +37,7 @@ function _parse_reference( r, c, s, o )
        for v in r:gmatch("[^.]+") do
                ref[#ref+1] = (v:gsub( "%$(.+)", vars ))
        end
-       
+
        if #ref < 2 then
                table.insert(ref, 1, s or '$section')
        end
@@ -81,7 +81,11 @@ function check( self, object, nodeps )
 
                for _, dep in ipairs(object:scheme('depends')) do
                        local subcondition = true
-                       for k, v in pairs(dep) do
+                       local score        = 0
+
+                       for k, v in util.spairs(
+                               dep, function(a, b) return type(dep[a]) == "string" end
+                       ) do
                                -- XXX: better error
                                local ref = _parse_reference( k, unpack(object.cref) )
 
@@ -103,10 +107,13 @@ function check( self, object, nodeps )
                                                derr:child(
                                                        type(v) == "boolean"
                                                                and ERR.DEP_NOVALUE(option, depstr)
-                                                               or  ERR.DEP_NOTEQUAL(option, {depstr, v})
+                                                               or  ERR.DEP_NOTEQUAL(option, {depstr, v}),
+                                                       score
                                                )
 
-                                               break
+                                               --break
+                                       else
+                                               score = score + ( type(v) == "boolean" and 1 or 10 )
                                        end
                                else
                                        subcondition = false

diff --git a/libs/uvl/luasrc/uvl/errors.lua b/libs/uvl/luasrc/uvl/errors.lua
index 9cd8d19cfae641966a0ad586d664963c5da2d4e4..983b619230f82ff593b503394ab0cab023f56560 100644 (file)
--- a/libs/uvl/luasrc/uvl/errors.lua
+++ b/libs/uvl/luasrc/uvl/errors.lua
@@ -19,7 +19,7 @@ local uvl = require "luci.uvl"
 local util = require "luci.util"
 local string = require "string"
 
-local ipairs, error, type = ipairs, error, type 
+local ipairs, error, type = ipairs, error, type
 local tonumber, unpack = tonumber, unpack
 
 
@@ -184,3 +184,15 @@ function error.is(self, code)
        end
        return false
 end
+
+function error.is_all(self, code)
+       if self.code == code then
+               return true
+       else
+               local equal = false
+               for _, c in ipairs(self.childs) do
+                       equal = ( c.code == code )
+               end
+               return equal
+       end
+end