[checkmk-commits] 6344 FIX Fixed exception in MIB listing when directories are e.g. in /usr/ share/snmp/mibs

Module: check_mk Branch: master Commit: 3ec8456b4cf41ef41bfcbdb2c9a551ee0c0d8170 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ec8456b4cf41e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 16 15:23:46 2018 +0200 6344 FIX Fixed exception in MIB listing when directories are e.g. in /usr/share/snmp/mibs Change-Id: I16e8ac2aa7129db7bd8806877cb90e816fd3078d --- .werks/6344 | 11 +++++++++++ cmk/gui/plugins/wato/mkeventd.py | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/6344 b/.werks/6344 new file mode 100644 index 0000000..5fe4c81 --- /dev/null +++ b/.werks/6344 @@ -0,0 +1,11 @@ +Title: Fixed exception in MIB listing when directories are e.g. in /usr/share/snmp/mibs +Level: 1 +Component: ec +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1531471230 + + diff --git a/cmk/gui/plugins/wato/mkeventd.py b/cmk/gui/plugins/wato/mkeventd.py index 8b46664..8cf8d52 100644 --- a/cmk/gui/plugins/wato/mkeventd.py +++ b/cmk/gui/plugins/wato/mkeventd.py @@ -24,6 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +import os import zipfile import cStringIO @@ -2556,8 +2557,12 @@ class ModeEventConsoleMIBs(EventConsoleMode): raise for fn in file_names: + mib_path = path + "/" + fn + if os.path.isdir(mib_path): + continue + if fn[0] != '.': - mib = self._parse_snmp_mib_header(path + "/" + fn) + mib = self._parse_snmp_mib_header(mib_path) found[fn] = mib return found