[checkmk-commits] Check_MK Git: check_mk: windows msi installer: fixed sort order of files in cabinet file

Module: check_mk Branch: master Commit: 1bcd13d9e38636fbe780b17d7866397161a7f32d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1bcd13d9e38636… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Sep 9 14:14:58 2014 +0200 windows msi installer: fixed sort order of files in cabinet file --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 208896 -> 208896 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 208896 -> 208896 bytes agents/windows/check_mk_agent.exe | Bin 177664 -> 177664 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 177664 -> 177664 bytes agents/windows/install_agent-64.exe | Bin 160048 -> 160015 bytes agents/windows/install_agent.exe | Bin 156931 -> 156898 bytes agents/windows/msibuild/msi-update | 5 ++--- 8 files changed, 3 insertions(+), 4 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index d88e313..76a8b2b 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -81 +83 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 21d038a..29b7ad0 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 4dd0178..ef1e9a7 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 60e02f3..404846c 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index bb8b51a..23ba18e 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index e564cd0..e7401e6 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index e97de73..9dc0c7f 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/msibuild/msi-update b/agents/windows/msibuild/msi-update index 3790b49..a999e84 100755 --- a/agents/windows/msibuild/msi-update +++ b/agents/windows/msibuild/msi-update @@ -94,7 +94,7 @@ cabinet_files = [] for line in lines_file_idt[3:]: tokens = line.split("\t") filename = tokens[0] - cabinet_files.append(filename) + cabinet_files.append((tokens[-1], filename)) file_stats = os.stat(source_dir + "/" + filename) new_size = file_stats.st_size tokens[3] = str(new_size) @@ -172,9 +172,8 @@ os.system((path_prefix + "msibuild %(new_msi_file)s -q \"DELETE FROM _Streams wh verbose("Generating new product.cab") lcab_files = "" -for lcab_file in cabinet_files: +for index, lcab_file in sorted(cabinet_files): lcab_files += "%(source_dir)s/%(lcab_file)s " % globals() - os.system("lcab -n %(lcab_files)s %(work_dir)s/product.cab" % globals()) # Add modified product.cab