[checkmk-commits] Check_MK Git: check_mk: Fixed exception in ListOfStrings valuespec when datatype is wrong

Module: check_mk Branch: master Commit: 69cfccaf1343c9582ea125ff227fce67dedfa39a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69cfccaf1343c9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 5 11:58:47 2015 +0200 Fixed exception in ListOfStrings valuespec when datatype is wrong --- web/htdocs/valuespec.py | 4 ++-- web/htdocs/wato.py | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 538fa12..2864d98 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -801,8 +801,8 @@ class ListOfStrings(ValueSpec): def validate_datatype(self, value, vp): if type(value) != list: - raise MKUserError(varprefix, _("Expected data type is " - "list, but your type is %s." % type_name(value))) + raise MKUserError(vp, _("Expected data type is list, but your type is %s." % + type_name(value))) for nr, s in enumerate(value): self._valuespec.validate_datatype(s, vp + "_%d" % nr) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d2eddf8..a613945 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3351,7 +3351,12 @@ def show_service_table(host, firsttime): rulespec["valuespec"].validate_value(params, "") paramtext = rulespec["valuespec"].value_to_text(params) except Exception, e: - paramtext = _("Invalid check parameter: %s!") % e + if config.debug: + import traceback + err = traceback.format_exc() + else: + err = e + paramtext = _("Invalid check parameter: %s!") % err paramtext += _(" The parameter is: %r") % (params,) paramtext += _(" The varname is: %s") % varname