X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=libs%2Fuvl%2Fluasrc%2Fuvl%2Fdependencies.lua;fp=libs%2Fuvl%2Fluasrc%2Fuvl%2Fdependencies.lua;h=d19149e7ab2a9a0f80a4e18cf0ce444c66f768d4;hp=5b67dffe4ae28af2eab16e0f40c19de05fc513e0;hb=7aee80de5c325d49fe29b6d21b3cb36aa28a2730;hpb=8d75d524f99be11e722ae05bd714450388659e4c

diff --git a/libs/uvl/luasrc/uvl/dependencies.lua b/libs/uvl/luasrc/uvl/dependencies.lua
index 5b67dffe4..d19149e7a 100644
--- 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,11 +81,7 @@ function check( self, object, nodeps )
 
 		for _, dep in ipairs(object:scheme('depends')) do
 			local subcondition = true
-			local score        = 0
-
-			for k, v in util.spairs(
-				dep, function(a, b) return type(dep[a]) == "string" end
-			) do
+			for k, v in pairs(dep) do
 				-- XXX: better error
 				local ref = _parse_reference( k, unpack(object.cref) )
 
@@ -107,13 +103,10 @@ function check( self, object, nodeps )
 						derr:child(
 							type(v) == "boolean"
 								and ERR.DEP_NOVALUE(option, depstr)
-								or  ERR.DEP_NOTEQUAL(option, {depstr, v}),
-							score
+								or  ERR.DEP_NOTEQUAL(option, {depstr, v})
 						)
 
-						--break
-					else
-						score = score + ( type(v) == "boolean" and 1 or 10 )
+						break
 					end
 				else
 					subcondition = false