Module: check_mk Branch: master Commit: e73d1c4c6570bb292af719e14b7e9657fbfe1b34 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e73d1c4c6570bb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 15 15:49:27 2014 +0200 #1129 FIX Windows MSI-Installer: some systems created corrupted check_mk_agent.msi files The tool msibuild had troubles updating the msi's "Summary Information" on some distributions. It is no longer used for this task... --- .werks/1129 | 11 +++++++++++ ChangeLog | 1 + agents/windows/msibuild/msi-update | 6 +++--- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.werks/1129 b/.werks/1129 new file mode 100644 index 0000000..0deb8cf --- /dev/null +++ b/.werks/1129 @@ -0,0 +1,11 @@ +Title: Windows MSI-Installer: some systems created corrupted check_mk_agent.msi files +Level: 2 +Component: core +Compatible: compat +Version: 1.2.5i6 +Date: 1413380611 +Class: fix + +The tool msibuild had troubles updating the msi's "Summary Information" on some distributions. +It is no longer used for this task... + diff --git a/ChangeLog b/ChangeLog index 5b94013..4d3d056 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Core & Setup: * 1008 Overall check timeout for Check_MK checks now defaults to CRIT state... * 1373 SEC: Do not ouput complete command line when datasource programs fail... + * 1129 FIX: Windows MSI-Installer: some systems created corrupted check_mk_agent.msi files... Checks & Agents: * 0185 knuerr_rms_humidity, knuerr_rms_temp: Two new Checks to Monitor the Temperature and the Humidity on Knürr RMS Devices diff --git a/agents/windows/msibuild/msi-update b/agents/windows/msibuild/msi-update index 99a5dd8..667f9ae 100755 --- a/agents/windows/msibuild/msi-update +++ b/agents/windows/msibuild/msi-update @@ -159,10 +159,10 @@ for entry in [ "Property", "File", "Upgrade" ]: os.system((path_prefix + "msibuild %(new_msi_file)s -i %(work_dir)s/%(file)s.idt") % \ { "work_dir" : work_dir, "new_msi_file": new_msi_file, "file": entry }) -# Update summary info with new uid +# Update summary info with new uuid (HACK! - the msibuild way is not working on all systems...) package_code = ("{%s}" % uuid.uuid1()).upper() -os.system((path_prefix + 'msibuild %(new_msi_file)s -s "Check_MK 32/64 bit MSI installer" "Mathias Kettner GmbH" "Intel;1033" "%(code)s"') %\ - {"code": package_code, "new_msi_file": new_msi_file}) +os.system("sed -i -e s/{08012468-53DE-4/%(start)s/ -e s/2A3-BAA9-FE4C2A129135}/%(end)s/ %(new_msi_file)s" % \ + {"new_msi_file": new_msi_file, "start": package_code[:16], "end": package_code[16:]}) # Remove original product.cab from stream verbose("Removing product.cab from %s" % new_msi_file)