diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2017-09-06 09:46:18 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-09-06 10:19:35 +0200 |
commit | dd3d32d13cf03a9e6ca661408b7995e8493c6af4 (patch) | |
tree | 019a40a309750b92dcc28ab2bccb76d1b574eddf /coin/provisioning/common/python.ps1 | |
parent | cc8a7501f329fbfefd1584f18ac7ff413e2d0854 (diff) | |
parent | 88525879919a3aa36d1753e8d4348201f2a44046 (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qtdeclarative.txt
coin/provisioning/common/InstallPKGFromURL.sh
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh
Change-Id: Id174b48e650ed18fbba48b4fc617ee075b0586ec
Diffstat (limited to 'coin/provisioning/common/python.ps1')
-rw-r--r-- | coin/provisioning/common/python.ps1 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/coin/provisioning/common/python.ps1 b/coin/provisioning/common/python.ps1 index 6c88689a..29114456 100644 --- a/coin/provisioning/common/python.ps1 +++ b/coin/provisioning/common/python.ps1 @@ -62,7 +62,9 @@ echo "Chancing allowZip64 value to 'True'..." (Get-Content C:\Python27\lib\zipfile.py) | ForEach-Object { $_ -replace "allowZip64=False", "allowZip64=True" } | Set-Content C:\Python27\lib\zipfile.py echo "Remove $package..." del $package -[Environment]::SetEnvironmentVariable("Path", $env:Path + ";C:\Python27;C:\Python27\Scripts", [EnvironmentVariableTarget]::Machine) + +$oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') +[Environment]::SetEnvironmentVariable("Path", $oldPath + ";C:\Python27;C:\Python27\Scripts", [EnvironmentVariableTarget]::Machine) C:\Python27\python.exe -m ensurepip # Install python virtual env |