summaryrefslogtreecommitdiff
path: root/mesecons
diff options
context:
space:
mode:
authorJeija <jeija@mesecons.net>2014-11-22 16:00:49 +0100
committerJeija <jeija@mesecons.net>2014-11-22 16:00:49 +0100
commit29dc50057c5f82d018c52df6250a0097ccb50e43 (patch)
tree7e05bb8784dc8937778cb919f68461eefc70b639 /mesecons
parent5be179bf110b44bdc06df6dbfde4e61487cf0635 (diff)
downloadmesecons-29dc50057c5f82d018c52df6250a0097ccb50e43.tar
mesecons-29dc50057c5f82d018c52df6250a0097ccb50e43.tar.gz
mesecons-29dc50057c5f82d018c52df6250a0097ccb50e43.tar.bz2
mesecons-29dc50057c5f82d018c52df6250a0097ccb50e43.tar.xz
mesecons-29dc50057c5f82d018c52df6250a0097ccb50e43.zip
Fix bug in mesecon.mergetable that caused false rules
Diffstat (limited to 'mesecons')
-rw-r--r--mesecons/util.lua5
1 files changed, 3 insertions, 2 deletions
diff --git a/mesecons/util.lua b/mesecons/util.lua
index 281997a..5549325 100644
--- a/mesecons/util.lua
+++ b/mesecons/util.lua
@@ -194,13 +194,14 @@ function mesecon.cmpAny(t1, t2)
return true
end
--- does not overwrite values
+-- does not overwrite values; number keys (ipairs) are appended, not overwritten
mesecon.mergetable = function(source, dest)
for k, v in pairs(source) do
dest[k] = dest[k] or v
end
+
for i, v in ipairs(source) do
- dest[i] = dest[i] or v
+ table.insert(dest, v)
end
end