[checkmk-commits] Try to fix issue with already existing archive during copy (

possibly a race condition) Message-ID: <5a951014.flldaCGJE6uPbq08%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: b7af1339ec5b8c437cdafeb5159a4620b49cdc13 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7af1339ec5b8c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 27 08:51:46 2018 +0100 Try to fix issue with already existing archive during copy (possibly a race condition) Change-Id: I2787d9073bd16a9bb739a64c0b8986f2dff0b256 --- agents/windows/frozen_binaries/pyinstaller-deps.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/windows/frozen_binaries/pyinstaller-deps.make b/agents/windows/frozen_binaries/pyinstaller-deps.make index 12580fd..c4c9a11 100644 --- a/agents/windows/frozen_binaries/pyinstaller-deps.make +++ b/agents/windows/frozen_binaries/pyinstaller-deps.make @@ -90,7 +90,7 @@ $(PYTHON_PACKAGES): $(BUILD_DIR)/drive_c/Python27/python.exe cd pip && \ wine c:\\Python27\\python.exe -m pip download --no-deps $($@) && \ mkdir -p $(CURDIR)/src/pip && \ - cp -r * $(CURDIR)/src/pip + cp --no-clobber -r * $(CURDIR)/src/pip new_packages: $(BUILD_DIR)/drive_c/Python27/python.exe # Use this target to obtain the newest versions of the needed packages. @@ -114,4 +114,4 @@ src/vcredist_x86.exe: curl -O https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966… setup: - sudo apt-get install scons upx-ucl wine \ No newline at end of file + sudo apt-get install scons upx-ucl wine