[checkmk-commits] 4704 FIX MSI generation: fixed bug in MSI version number generation which broke the 1.4.0 MSI installer

Module: check_mk Branch: master Commit: e8e204433ffe990821f8de914f02c7e15a9905ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8e204433ffe99… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jun 2 11:35:00 2017 +0200 4704 FIX MSI generation: fixed bug in MSI version number generation which broke the 1.4.0 MSI installer Change-Id: Ib544f7a9d527311f67b453667a66e5c94e93db18 --- .werks/4704 | 10 ++++++++++ agents/windows/msibuild/msi-update | 2 ++ 2 files changed, 12 insertions(+) diff --git a/.werks/4704 b/.werks/4704 new file mode 100644 index 0000000..69c6d78 --- /dev/null +++ b/.werks/4704 @@ -0,0 +1,10 @@ +Title: MSI generation: fixed bug in MSI version number generation which broke the 1.4.0 MSI installer +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1496396045 +Class: fix + + diff --git a/agents/windows/msibuild/msi-update b/agents/windows/msibuild/msi-update index cf8656a..54b68d5 100755 --- a/agents/windows/msibuild/msi-update +++ b/agents/windows/msibuild/msi-update @@ -50,6 +50,7 @@ try: # Revision (from build_version) revision = sys.argv[3] + # TODO: complete overhaul of version generation # Official version name, e.g # 1.2.5i4p1 # 2015.04.12 @@ -59,6 +60,7 @@ try: try: major, minor, build = map(lambda x: x.lstrip("0"), new_version_name.split("-")[0].split(".")[:3]) + build = build == "" and "0" or build if len(major) > 3: # Looks like a daily build.. 2015.03.05 major = major[2:].lstrip("0")