lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-05-01 08:57:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Print all error messages during Python provisioning"

Browse Source 
This reverts commit 59f141ec3c.

Reason for revert: Provisioning will continue even if python installation fails

Change-Id: Iaa0a48a2179c2198a32fb9a4feb55266cc64c396
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
This commit is contained in:
Heikki Halmet
2020-09-01 06:29:51 +00:00
parent 59f141ec3c
commit 9028eb10a5
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
coin/provisioning/common/windows/python.ps1
View File

@@ -1,6 +1,6 @@
############################################################################# #############################################################################
## ##
## Copyright (C) 2020 The Qt Company Ltd. ## Copyright (C) 2019 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/ ## Contact: http://www.qt.io/licensing/
## ##
## This file is part of the provisioning scripts of the Qt Toolkit. ## 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 Download $externalUrl $internalUrl $package
Verify-Checksum $package $sha1 Verify-Checksum $package $sha1
Write-Host "Installing $package..." Write-Host "Installing $package..."
# /levx = e:'All error messages' v:'Verbose' x:'Extra debugging info' Run-Executable "msiexec" "/passive /i $package TARGETDIR=$targetDir ALLUSERS=1"
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
}
# 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 # 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'..." 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 (Get-Content $targetDir\lib\zipfile.py) | ForEach-Object { $_ -replace "allowZip64=False", "allowZip64=True" } | Set-Content $targetDir\lib\zipfile.py