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

* luci/libs/uvl:

Browse source 
- fix command line switches for uvl
	- honour STRICT_UNKOWN_OPTIONS in luci.uvl._validate_option()
This commit is contained in:
Jo-Philipp Wich 2008-09-03 02:08:38 +00:00
parent 3817e51402
commit eedb43da9b
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libs/uvl/luasrc/uvl.lua
View file

@ -280,7 +280,11 @@ function UVL._validate_option( self, option, nodeps )
self.beenthere[option:cid()] = true
if not option:scheme() and not option:parent():scheme('dynamic') then
return false, option:error(ERR.OPT_UNKNOWN(option))
if STRICT_UNKNOWN_OPTIONS then
return false, option:error(ERR.OPT_UNKNOWN(option))
else
return true
end
elseif option:scheme() then
if option:scheme('required') and not option:value() then

8
libs/uvl/root/usr/bin/uvl
View file

@ -185,13 +185,13 @@ Actions:
os.exit(255)
elseif arguments[1] == "verify" then
luci.uvl.STRICT_UNKNOWN_SECTIONS =
( options['no-strict-sections'] and false or true )
( not options['no-strict-sections'] and true or false )
luci.uvl.STRICT_UNKNOWN_OPTIONS =
( options['no-strict-options'] and false or true )
( not options['no-strict-options'] and true or false )
luci.uvl.STRICT_EXTERNAL_VALIDATORS =
( options['no-strict-validators'] and false or true )
( not options['no-strict-validators'] and true or false )
luci.uvl.STRICT_LIST_TYPE =
( options['no-strict-lists'] and false or true )
( not options['no-strict-lists'] and true or false )
local uvl = luci.uvl.UVL(
type(options.schemedir) == "string" and options.schemedir or nil