diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2008-09-03 02:08:38 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2008-09-03 02:08:38 +0000 |
| commit | eedb43da9b5193380faeeb39754298335a0f0bb9 (patch) | |
| tree | aecbbe249a5da5c4f9a348f42ea6691546b9aa70 | |
| parent | 3817e514023df4af6f7d8cb43870dd512d73841f (diff) | |
* luci/libs/uvl:
- fix command line switches for uvl
- honour STRICT_UNKOWN_OPTIONS in luci.uvl._validate_option()
| -rw-r--r-- | libs/uvl/luasrc/uvl.lua | 6 | ||||
| -rwxr-xr-x | libs/uvl/root/usr/bin/uvl | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/libs/uvl/luasrc/uvl.lua b/libs/uvl/luasrc/uvl.lua index e5a6c7569..908cfd7bd 100644 --- a/libs/uvl/luasrc/uvl.lua +++ b/libs/uvl/luasrc/uvl.lua @@ -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 diff --git a/libs/uvl/root/usr/bin/uvl b/libs/uvl/root/usr/bin/uvl index b859097fa..0fe7a13a7 100755 --- a/libs/uvl/root/usr/bin/uvl +++ b/libs/uvl/root/usr/bin/uvl @@ -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 |