Merge pull request #30154 from Oro/fix-file-serialize-windows

Fix file serialize on windows
This commit is contained in:
Mike Place 2016-01-05 11:08:40 -07:00
commit bed38d1a65

View file

@ -4243,6 +4243,14 @@ def serialize(name,
return _error(
ret, 'Neither \'dataset\' nor \'dataset_pillar\' was defined')
if salt.utils.is_windows():
if group is not None:
log.warning(
'The group argument for {0} has been ignored as this '
'is a Windows system.'.format(name)
)
group = user
if merge_if_exists:
if os.path.isfile(name):
if formatter == 'yaml':