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

Merge pull request #35872 from amontalban/fix_35869_20163

Browse Source 
Fixes #35869 for branch 2016.3
This commit is contained in:
Mike Place 2016-08-30 16:04:10 +09:00 committed by GitHub
commit f3ac4e4293
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/modules/timezone.py
View File

@ -85,6 +85,8 @@ def _get_zone_etc_localtime():
return olson_name[tzdir_len:]
except OSError as exc:
if exc.errno == errno.ENOENT:
if 'FreeBSD' in __grains__['os_family']:
return get_zonecode()
raise CommandExecutionError(tzfile + ' does not exist')
elif exc.errno == errno.EINVAL:
log.warning(