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

Merge pull request #45069 from rallytime/bp-45040

Browse source 
Back-port #45040 to 2016.11
This commit is contained in:
Nicole Thomas 2017-12-19 09:25:57 -05:00 • committed by GitHub
commit 637fdaed58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -209,7 +209,7 @@ Section -Prerequisites
# of the user variable are undefined).
# http://nsis.sourceforge.net/Reference/ExecWait
ClearErrors
ExecWait '"$INSTDIR\vcredist.exe" /qb! /norestart' $0
ExecWait '"$INSTDIR\vcredist.exe" /qb! /quiet /norestart' $0
IfErrors 0 CheckVcRedistErrorCode
MessageBox MB_OK \
"VC Redist 2008 SP1 MFC failed to install. Try installing the package manually." \