valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #41173 from twangboy/fix_installer

Browse Source 
Add silent action to MsgBox for Path Actions
This commit is contained in:
Nicole Thomas 2017-05-10 13:57:05 -06:00 committed by GitHub
commit d7ec37b003
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
doc/topics/releases/2016.11.5.rst
View File

@ -13,13 +13,20 @@ Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt
Statistics: Statistics:
- Total Merges: **82** - Total Merges: **83**
- Total Issue references: **30** - Total Issue references: **31**
- Total PR references: **98** - Total PR references: **99**
Changes: Changes:
- **PR** `#41173`_: (*twangboy*) Add silent action to MsgBox for Path Actions
@ *2017-05-10T17:22:18Z*
- **ISSUE** `#41099`_: (*lomeroe*) Windows 2016.11.4 minion installer silent mode issue
| refs: `#41173`_
* 96918dc Add silent action to MsgBox for Path Actions
- **PR** `#41134`_: (*twangboy*) Fix `pkg.install` on Windows on 2016.11 - **PR** `#41134`_: (*twangboy*) Fix `pkg.install` on Windows on 2016.11
@ *2017-05-09T15:10:19Z* @ *2017-05-09T15:10:19Z*
@ -815,10 +822,12 @@ Changes:
.. _`#41093`: https://github.com/saltstack/salt/pull/41093 .. _`#41093`: https://github.com/saltstack/salt/pull/41093
.. _`#41097`: https://github.com/saltstack/salt/pull/41097 .. _`#41097`: https://github.com/saltstack/salt/pull/41097
.. _`#41098`: https://github.com/saltstack/salt/pull/41098 .. _`#41098`: https://github.com/saltstack/salt/pull/41098
.. _`#41099`: https://github.com/saltstack/salt/pull/41099
.. _`#41100`: https://github.com/saltstack/salt/issues/41100 .. _`#41100`: https://github.com/saltstack/salt/issues/41100
.. _`#41102`: https://github.com/saltstack/salt/pull/41102 .. _`#41102`: https://github.com/saltstack/salt/pull/41102
.. _`#41103`: https://github.com/saltstack/salt/pull/41103 .. _`#41103`: https://github.com/saltstack/salt/pull/41103
.. _`#41134`: https://github.com/saltstack/salt/pull/41134 .. _`#41134`: https://github.com/saltstack/salt/pull/41134
.. _`#41173`: https://github.com/saltstack/salt/pull/41173
.. _`#5`: https://github.com/saltstack/salt/issues/5 .. _`#5`: https://github.com/saltstack/salt/issues/5
.. _`bp-37696`: https://github.com/saltstack/salt/pull/37696 .. _`bp-37696`: https://github.com/saltstack/salt/pull/37696
.. _`bp-38115`: https://github.com/saltstack/salt/pull/38115 .. _`bp-38115`: https://github.com/saltstack/salt/pull/38115

11
pkg/windows/installer/Salt-Minion-Setup.nsi
View File

@ -539,8 +539,10 @@ Function AddToPath
; Check for Error Code 234, Path too long for the variable ; Check for Error Code 234, Path too long for the variable
IntCmp $4 234 0 +4 +4 ; $4 == ERROR_MORE_DATA IntCmp $4 234 0 +4 +4 ; $4 == ERROR_MORE_DATA
DetailPrint "AddToPath: original length $2 > ${NSIS_MAX_STRLEN}" DetailPrint "AddToPath Failed: original length $2 > ${NSIS_MAX_STRLEN}"
MessageBox MB_OK "PATH not updated, original length $2 > ${NSIS_MAX_STRLEN}" MessageBox MB_OK \
"You may add C:\salt to the %PATH% for convenience when issuing local salt commands from the command line." \
/SD IDOK
Goto done Goto done
; If no error, continue ; If no error, continue
@ -575,7 +577,9 @@ Function AddToPath
; Make sure the new length isn't over the NSIS_MAX_STRLEN ; Make sure the new length isn't over the NSIS_MAX_STRLEN
IntCmp $2 ${NSIS_MAX_STRLEN} +4 +4 0 IntCmp $2 ${NSIS_MAX_STRLEN} +4 +4 0
DetailPrint "AddToPath: new length $2 > ${NSIS_MAX_STRLEN}" DetailPrint "AddToPath: new length $2 > ${NSIS_MAX_STRLEN}"
MessageBox MB_OK "PATH not updated, new length $2 > ${NSIS_MAX_STRLEN}." MessageBox MB_OK \
"You may add C:\salt to the %PATH% for convenience when issuing local salt commands from the command line." \
/SD IDOK
Goto done Goto done
; Append dir to PATH ; Append dir to PATH
@ -637,7 +641,6 @@ Function ${un}RemoveFromPath
; Check for Error Code 234, Path too long for the variable ; Check for Error Code 234, Path too long for the variable
IntCmp $4 234 0 +4 +4 ; $4 == ERROR_MORE_DATA IntCmp $4 234 0 +4 +4 ; $4 == ERROR_MORE_DATA
DetailPrint "AddToPath: original length $2 > ${NSIS_MAX_STRLEN}" DetailPrint "AddToPath: original length $2 > ${NSIS_MAX_STRLEN}"
MessageBox MB_OK "PATH not updated, original length $2 > ${NSIS_MAX_STRLEN}"
Goto done Goto done
; If no error, continue ; If no error, continue