Changeset 5870

Timestamp:

03/18/10 23:37:41 (3 years ago)

Author:

jow

Message:

luci-0.9: merge r5869

Files:

• luci/branches/luci-0.9/libs/uvl/luasrc/uvl/dependencies.lua (modified) (9 diffs)

luci/branches/luci-0.9/libs/uvl/luasrc/uvl/dependencies.lua

@@ -16 +16 @@
 
 local uvl = require "luci.uvl"
-local ERR = require "luci.uvl.errors"
+local ERR = require "luci.uvl.errors".error
 local util = require "luci.util"
 local table = require "table"
@@ -68 +68 @@
 function check( self, object, nodeps )
 
-    local derr = ERR.DEPENDENCY(object)
+    local derr = ERR('DEPENDENCY', object)
 
     if not self.depseen[object:cid()] then
         self.depseen[object:cid()] = true
     else
-        return false, derr:child(ERR.DEP_RECURSIVE(object))
+        return false, derr:child(ERR('DEP_RECURSIVE', object))
     end
 
@@ -87 +87 @@
 
                 if not ref then
-                    return false, derr:child(ERR.SME_BADDEP(object,k))
+                    return false, derr:child(ERR('SME_BADDEP',object,k))
                 end
 
@@ -103 +103 @@
                         derr:child(
                             type(v) == "boolean"
-                                and ERR.DEP_NOVALUE(option, depstr)
-                                or  ERR.DEP_NOTEQUAL(option, {depstr, v})
+                                and ERR('DEP_NOVALUE', option, depstr)
+                                or  ERR('DEP_NOTEQUAL', option, {depstr, v})
                         )
 
@@ -113 +113 @@
 
                     local depstr = _serialize_dependency( dep, v )
-                    derr:child(ERR.DEP_NOTVALID(option, depstr):child(err))
+                    derr:child(ERR('DEP_NOTVALID', option, depstr):child(err))
 
                     break
@@ -140 +140 @@
         local valid = false
         local enum  = object:enum()
-        local eerr  = ERR.DEP_BADENUM(enum)
+        local eerr  = ERR('DEP_BADENUM', enum)
 
         for _, dep in ipairs(enum:scheme('enum_depends')[object:value()]) do
@@ -149 +149 @@
 
                 if not ref then
-                    return false, derr:child(eerr:child(ERR.SME_BADDEP(enum,k)))
+                    return false, derr:child(eerr:child(ERR('SME_BADDEP',enum,k)))
                 end
 
@@ -165 +165 @@
                         eerr:child(
                             type(v) == "boolean"
-                                and ERR.DEP_NOVALUE(option, depstr)
-                                or  ERR.DEP_NOTEQUAL(option, {depstr, v})
+                                and ERR('DEP_NOVALUE', option, depstr)
+                                or  ERR('DEP_NOTEQUAL', option, {depstr, v})
                         )
 
@@ -175 +175 @@
 
                     local depstr = _serialize_dependency( dep, v )
-                    eerr:child(ERR.DEP_NOTVALID(option, depstr):child(err))
+                    eerr:child(ERR('DEP_NOTVALID', option, depstr):child(err))
 
                     break