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

Removed hwclock functions, added more descriptive fail message

Browse Source
This commit is contained in:
twangboy 2016-01-20 12:21:27 -07:00
parent db777e3838
commit 87221933d9
2 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
salt/modules/mac_timezone.py
View File

@ -398,23 +398,3 @@ def set_time_server(time_server='time.apple.com'):
_execute_return_success(cmd)
return time_server in get_time_server()
def get_hwclock():
'''
Returns: Always returns 'UTC' because OS X Hardware clock is always UTC
CLI Example:
.. code-block:: bash
salt '*' timezone.get_hwclock
'''
return 'UTC'
def set_hwclock():
'''
Setting not editable in Mac
'''
pass

6
salt/modules/timezone.py
View File

@ -27,11 +27,13 @@ def __virtual__():
'''
if salt.utils.is_windows():
return (False, 'The timezone execution module failed to load: '
'not available on Windows systems.')
'win_timezone.py should replace this module on Windows.'
'There was a problem loading win_timezone.py.')
if salt.utils.is_darwin():
return (False, 'The timezone execution module failed to load: '
'not available on MacOS systems.')
'mac_timezone.py should replace this module on OS X.'
'There was a problem loading mac_timezone.py.')
return __virtualname__