[checkmk-commits] added WK5232

Module: check_mk Branch: master Commit: c36b3531eb7ac9eca8ddf9c8f8bd3f109d100f76 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c36b3531eb7ac9… Author: Andreas Boesl &lt;ab(a)mathias-kettner.de&gt; Date: Fri Sep 29 12:15:43 2017 +0200 added WK5232 Change-Id: I5e4dba904adabaa069c9eee40873b99e26761a78 --- .werks/5232 | 11 +++++++++++ cmk_base/checking.py | 3 +++ 2 files changed, 14 insertions(+) diff --git a/.werks/5232 b/.werks/5232 new file mode 100644 index 0000000..582b505 --- /dev/null +++ b/.werks/5232 @@ -0,0 +1,11 @@ +Title: Agent version check: fixed exception when an offcial release is expected and the agents version is a daily build +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1506678406 + + diff --git a/cmk_base/checking.py b/cmk_base/checking.py index c8c4196..7bad059 100644 --- a/cmk_base/checking.py +++ b/cmk_base/checking.py @@ -212,6 +212,9 @@ def _is_expected_agent_version(agent_version, expected_version): return False elif 'release' in spec: + if cmk_base.utils.is_daily_build_version(agent_version): + return False + if cmk_base.utils.parse_check_mk_version(agent_version) \ < cmk_base.utils.parse_check_mk_version(spec['release']): return False