saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add nonfatal switch to VCRedist

Browse source
This commit is contained in:
twangboy 2018-08-14 10:21:18 -06:00
parent 0b9f2f8884
commit 1227095c5d
No known key found for this signature in database
GPG key ID: 93FF3BDEB278C9EB
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/windows/installer/Salt-Minion-Setup.nsi
View file

@ -244,7 +244,9 @@ Section -Prerequisites
# The Correct version of VCRedist is copied over by "build_pkg.bat"
SetOutPath "$INSTDIR\"
File "..\prereqs\vcredist.exe"
# This will throw an error on Py3 since we're no longer including VCRedist
# So, we'll add the /nonfatal switch
File /nonfatal "..\prereqs\vcredist.exe"
# If an output variable is specified ($0 in the case below),
# ExecWait sets the variable with the exit code (and only sets the
# error flag if an error occurs; if an error occurs, the contents