Changeset 3702

Timestamp:

11/04/08 17:11:25 (5 years ago)

Author:

jow

Message:

* luci/libs/uvl: fix option dependency error handling in case of different non-critical reasons

Location:

luci/trunk/libs/uvl/luasrc

Files:

• uvl.lua (modified) (1 diff)
• uvl/errors.lua (modified) (1 diff)

luci/trunk/libs/uvl/luasrc/uvl.lua

@@ -296 +296 @@
             local ok, err = dependencies.check( self, option )
             if not ok then
-                if not err:is_all(ERR.ERR_DEP_NOTEQUAL) and
-                   not err:is_all(ERR.ERR_DEP_NOVALUE)
-                then
+                if not err:is_all(ERR.ERR_DEP_NOTEQUAL,ERR.ERR_DEP_NOVALUE) then
                     option:error(err)
                     return false, option:errors()

luci/trunk/libs/uvl/luasrc/uvl/errors.lua

@@ -186 +186 @@
 end
 
-function error.is_all(self, code)
-    if self.code == code then
+function error.is_all(self, ...)
+    local codes = { ... }
+
+    if util.contains(codes, self.code) then
         return true
     else
         local equal = false
         for _, c in ipairs(self.childs) do
-            equal = ( c.code == code )
+            equal = util.contains(codes, c.code)
         end
         return equal