[checkmk-commits] [CMK-1850] - fixed error when bakery uses legacy baked_container.msi

Module: check_mk Branch: master Commit: cfda3eac05ef1e5a1b7523d52f5a15314b84bb9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cfda3eac05ef1e… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Mon Apr 8 12:27:38 2019 +0200 [CMK-1850] - fixed error when bakery uses legacy baked_container.msi - removed baked_container from the build script - msi-update uses instead of baked_container.msi check_mk_agent.msi Change-Id: I8d107105db09330f1a7a8d9151879f142083db0e --- agents/windows/msibuild/msi-update | 4 ++++ agents/wnx/build_release.cmd | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/agents/windows/msibuild/msi-update b/agents/windows/msibuild/msi-update index fa55685..100bc71 100755 --- a/agents/windows/msibuild/msi-update +++ b/agents/windows/msibuild/msi-update @@ -136,6 +136,10 @@ try: # MSI container to modify msi_file = sys.argv[1] + if msi_file.find("baked_container.msi"): + verbose("changing baked_container.msi to check_mk_agent.msi") + msi_file = msi_file.replace("baked_container.msi", + "check_mk_agent.msi") # The same container for all cases # Directory where the sources are contained source_dir = sys.argv[2] diff --git a/agents/wnx/build_release.cmd b/agents/wnx/build_release.cmd index 63ef90a..7351b85 100644 --- a/agents/wnx/build_release.cmd +++ b/agents/wnx/build_release.cmd @@ -96,7 +96,6 @@ exit 100 pushd %REMOTE_MACHINE% copy check_mk_service.msi check_mk_agent.msi -copy check_mk_service.msi baked_container.msi copy check_mk_service32.exe check_mk_agent.exe copy check_mk_service64.exe check_mk_agent-64.exe