From 9028eb10a50e14226d8435459220f357b01b53a9 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 1 Sep 2020 06:29:51 +0000 Subject: Revert "Print all error messages during Python provisioning" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 59f141ec3cdc7c2d79480d1d26434a98f48eea93. Reason for revert: Provisioning will continue even if python installation fails Change-Id: Iaa0a48a2179c2198a32fb9a4feb55266cc64c396 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/windows/python.ps1 | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/coin/provisioning/common/windows/python.ps1 b/coin/provisioning/common/windows/python.ps1 index 03f2a202..342358d5 100644 --- a/coin/provisioning/common/windows/python.ps1 +++ b/coin/provisioning/common/windows/python.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2020 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -55,14 +55,8 @@ Write-Host "Fetching from URL..." Download $externalUrl $internalUrl $package Verify-Checksum $package $sha1 Write-Host "Installing $package..." -# /levx = e:'All error messages' v:'Verbose' x:'Extra debugging info' -try { - Run-Executable "msiexec" "/passive /i $package /levx C:\Windows\Temp\Python_log.log TARGETDIR=$targetDir ALLUSERS=1" -} -catch { - Get-Content C:\Windows\Temp\Python_log.log -Tail 50 - exit 1 -} +Run-Executable "msiexec" "/passive /i $package TARGETDIR=$targetDir ALLUSERS=1" + # We need to change allowZip64 from 'False' to 'True' to be able to create ZIP files that use the ZIP64 extensions when the zipfile is larger than 2 GB Write-Host "Changing allowZip64 value to 'True'..." (Get-Content $targetDir\lib\zipfile.py) | ForEach-Object { $_ -replace "allowZip64=False", "allowZip64=True" } | Set-Content $targetDir\lib\zipfile.py -- cgit v1.2.3