summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2012-04-12 06:46:43 +0000
committerKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2012-04-12 06:46:43 +0000
commita650d948d28e5e67c38725ae9d81f858b8bff96c (patch)
treed4db7cd9503cbda3a6152bff1169cffeb5f9f67f
parent9ca4e2d6969579fd73f66c556f7e7b785de7144a (diff)
downloadawall-a650d948d28e5e67c38725ae9d81f858b8bff96c.tar.bz2
awall-a650d948d28e5e67c38725ae9d81f858b8bff96c.tar.xz
convert empty strings to nil values in input configuration table
skip expansion in the variable fragment to avoid clearing variable declarations
-rw-r--r--awall/init.lua6
1 files changed, 4 insertions, 2 deletions
diff --git a/awall/init.lua b/awall/init.lua
index 6ed0553..1d3e47a 100644
--- a/awall/init.lua
+++ b/awall/init.lua
@@ -143,12 +143,14 @@ function Config:init(confdirs, importdirs)
end
end
- obj[k] = val
+ obj[k] = val ~= '' and val or nil
end
end
end
- expandvars(self.input)
+ for k, v in pairs(self.input) do
+ if k ~= 'variable' then expandvars(v) end
+ end
local function insertrule(trule)