From 08427d1935f11862e49c540b3aeb2bb63c4437d6 Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Tue, 19 Mar 2019 17:16:03 +0100 Subject: [PATCH] ci: fix luacheck --- .luacheckrc | 8 ++++---- daemon/lua/trust_anchors.lua.in | 2 +- daemon/lua/trust_anchors.test/ta.test.lua | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.luacheckrc b/.luacheckrc index 7a5d3e1a4..885fa8220 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -71,10 +71,10 @@ ignore = { } -- Sandbox can set global variables -files['daemon/lua'].ignore = {'111', '121', '122'} -files['daemon/lua/kres-gen.lua'].ignore = {'631'} -- Allow overly long lines +files['**/daemon/lua'].ignore = {'111', '121', '122'} +files['**/daemon/lua/kres-gen.lua'].ignore = {'631'} -- Allow overly long lines -- Tests and scripts can use global variables files['scripts'].ignore = {'111', '112', '113'} files['tests'].ignore = {'111', '112', '113'} -files['modules/**/*.test.lua'].ignore = {'111', '112', '113', '121', '122'} -files['daemon/**/*.test.lua'].ignore = {'111', '112', '113', '121', '122'} +files['**/modules/**/*.test.lua'].ignore = {'111', '112', '113', '121', '122'} +files['**/daemon/**/*.test.lua'].ignore = {'111', '112', '113', '121', '122'} diff --git a/daemon/lua/trust_anchors.lua.in b/daemon/lua/trust_anchors.lua.in index f235a9707..cc1e8b3c9 100644 --- a/daemon/lua/trust_anchors.lua.in +++ b/daemon/lua/trust_anchors.lua.in @@ -11,7 +11,7 @@ local key_state = { Missing = 'Missing', Revoked = 'Revoked', Removed = 'Removed' } -local function upgrade_required(field) +local function upgrade_required() panic('Configuration upgrade required! Please refer to ' .. 'https://knot-resolver.readthedocs.io/en/stable/upgrading.html') end diff --git a/daemon/lua/trust_anchors.test/ta.test.lua b/daemon/lua/trust_anchors.test/ta.test.lua index ca68c701d..2071152d5 100644 --- a/daemon/lua/trust_anchors.test/ta.test.lua +++ b/daemon/lua/trust_anchors.test/ta.test.lua @@ -44,7 +44,7 @@ local function test_remove() trust_anchors.remove('.') same(trust_anchors.keysets['\0'], nil, 'Lua interface does not have the removed key') - local root_ta = ffi.C.kr_ta_get(ta_c, '\0') + root_ta = ffi.C.kr_ta_get(ta_c, '\0') same(root_ta == nil, true, 'C interface does not have the removed key') end -- 2.47.2