[checkmk-commits] Check_MK Git: check_mk: update of #2065, can now handle versions of type 1.2.6-2015.04.12

Module: check_mk Branch: master Commit: 7c49cdc96c44e1b6745e6a74abc0227ea0af96ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c49cdc96c44e1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 28 16:26:16 2015 +0200 update of #2065, can now handle versions of type 1.2.6-2015.04.12 --- agents/windows/msibuild/msi-update | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/agents/windows/msibuild/msi-update b/agents/windows/msibuild/msi-update index 8b5ac0c..14699bd 100755 --- a/agents/windows/msibuild/msi-update +++ b/agents/windows/msibuild/msi-update @@ -50,11 +50,15 @@ try: # Revision (from build_version) revision = sys.argv[3] - # Official version name, e.g 1.2.5i4p1 - new_version_name = sys.argv[4] + # Official version name, e.g + # 1.2.5i4p1 + # 2015.04.12 + # 1.2.6-2015.04.12 + new_version_name = sys.argv[4] major, minor, build = 1, 0, 0 try: - major, minor, build = map(lambda x: x.lstrip("0"), new_version_name.split(".")[:3]) + major, minor, build = map(lambda x: x.lstrip("0"), + new_version_name.split("-")[0].split(".")[:3]) if len(major) > 3: # Looks like a daily build.. 2015.03.05 major = major[2:].lstrip("0")