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 #39311 from morganwillcock/skip-reboot

Browse source 
win_system: return False from a skipped reboot
This commit is contained in:
Mike Place 2017-02-13 11:59:10 -07:00 • committed by GitHub
commit 2ca63a93cd
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/modules/win_system.py
View file

@ -173,7 +173,7 @@ def reboot(timeout=5, in_seconds=False, wait_for_reboot=False, # pylint: disabl
state intended to be executed
at the end of a state run (using *order: last*).
:return: True if successful
:return: True if successful (a reboot will occur)
:rtype: bool
CLI Example:
@ -251,7 +251,7 @@ def shutdown(message=None, timeout=5, force_close=True, reboot=False, # pylint:
If this is set to True, then then shutdown will only proceed
if the system reports a pending reboot.
:return: True if successful
:return: True if successful (a shutdown or reboot will occur)
:rtype: bool
CLI Example:
@ -263,7 +263,7 @@ def shutdown(message=None, timeout=5, force_close=True, reboot=False, # pylint:
timeout = _convert_minutes_seconds(timeout, in_seconds)
if only_on_pending_reboot and not get_pending_reboot():
return True
return False
if message and not isinstance(message, str):
message = message.decode('utf-8')