Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* luci/libs/uvl: revert accidentally committed changes in dependency handler

Browse source
This commit is contained in:
Jo-Philipp Wich 2008-11-04 16:02:47 +00:00
parent 8d75d524f9
commit 7aee80de5c
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libs/uvl/luasrc/uvl/dependencies.lua
View file

@ -37,7 +37,7 @@ function _parse_reference( r, c, s, o )
for v in r:gmatch("[^.]+") do for v in r:gmatch("[^.]+") do
ref[#ref+1] = (v:gsub( "%$(.+)", vars )) ref[#ref+1] = (v:gsub( "%$(.+)", vars ))
end end
if #ref < 2 then if #ref < 2 then
table.insert(ref, 1, s or '$section') table.insert(ref, 1, s or '$section')
end end
@ -81,11 +81,7 @@ function check( self, object, nodeps )
for _, dep in ipairs(object:scheme('depends')) do for _, dep in ipairs(object:scheme('depends')) do
local subcondition = true local subcondition = true
local score = 0 for k, v in pairs(dep) do
for k, v in util.spairs(
dep, function(a, b) return type(dep[a]) == "string" end
) do
-- XXX: better error -- XXX: better error
local ref = _parse_reference( k, unpack(object.cref) ) local ref = _parse_reference( k, unpack(object.cref) )
@ -107,13 +103,10 @@ function check( self, object, nodeps )
derr:child( derr:child(
type(v) == "boolean" type(v) == "boolean"
and ERR.DEP_NOVALUE(option, depstr) 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 end
else else
subcondition = false subcondition = false