Module: check_mk Branch: master Commit: 2b633933b373cad6c2689973fa4f19ea35f4641c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b633933b373ca… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 31 16:25:45 2017 +0200 4752 FIX MKP manager: Fixed creating packages for 1.4.0i* releases Change-Id: I45e1c0ac81d7d4dc5fb785f3d1cc496e184cf4a5 --- .werks/4752 | 11 +++++++++++ web/htdocs/valuespec.py | 4 +--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.werks/4752 b/.werks/4752 new file mode 100644 index 0000000..65fa2f9 --- /dev/null +++ b/.werks/4752 @@ -0,0 +1,11 @@ +Title: MKP manager: Fixed creating packages for 1.4.0i* releases +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i1 +Date: 1496240716 + + diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 55d2010..b7886e8 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -968,9 +968,7 @@ class HTTPUrl(TextAscii): def CheckMKVersion(**args): args = args.copy() - regex_unstable = "(1\.[1234]\.(1|3|5|7|9|11|13|15)i[1-9](p[0-9]+)?)" - regex_stable = "(1\.[1234]\.(0|2|4|6|8|10|12|14)([bp][1-9]?[0-9]+)?)" - args["regex"] = "(" + regex_unstable + "|" + regex_stable + ")$" + args["regex"] = "[0-9]+\.[0-9]+\.[0-9]+([bpi][0-9]+|i[0-9]+p[0-9]+)?$" args["regex_error"] = _("This is not a valid Check_MK version number") return TextAscii(**args)