[checkmk-commits] 6003 FIX HW/SW inventory: Fixed TypeError if any inventory hooks are executed

Module: check_mk Branch: master Commit: fe75e536f5fc020a6a542388ca17e6034b1ce07c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe75e536f5fc02… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue May 8 16:40:40 2018 +0200 6003 FIX HW/SW inventory: Fixed TypeError if any inventory hooks are executed Change-Id: I1e6cce66e33a10e9839b145d24b7ddf5aaed78f1 --- .werks/6003 | 10 ++++++++++ cmk_base/inventory.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/6003 b/.werks/6003 new file mode 100644 index 0000000..6ff1c2c --- /dev/null +++ b/.werks/6003 @@ -0,0 +1,10 @@ +Title: HW/SW inventory: Fixed TypeError if any inventory hooks are executed +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1525790394 +Class: fix + + diff --git a/cmk_base/inventory.py b/cmk_base/inventory.py index 89dbcb0..0561e03 100644 --- a/cmk_base/inventory.py +++ b/cmk_base/inventory.py @@ -351,7 +351,7 @@ def _run_inventory_export_hooks(hostname, inventory_tree): for hookname, ruleset in config.inv_exports.items(): entries = rulesets.host_extra_conf(hostname, ruleset) if entries: - hooks.append(hookname, entries[0]) + hooks.append((hookname, entries[0])) if not hooks: return