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

highlighting names of arguments in err msg

Browse Source
This commit is contained in:
Arnold Bechtoldt 2015-01-24 14:18:37 +01:00 committed by rallytime
parent 406ef728be
commit d2eb6b6f0c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/states/file.py
View File

@ -3957,14 +3957,14 @@ def serialize(name,
if len([_f for _f in [dataset, dataset_pillar] if _f]) > 1:
return _error(
ret, 'Only one of dataset and dataset_pillar is permitted')
ret, 'Only one of \'dataset\' and \'dataset_pillar\' is permitted')
if dataset_pillar:
dataset = __salt__['pillar.get'](dataset_pillar)
if dataset is None:
return _error(
ret, 'Neither \'dataset\' nor \'dataset_pillar\' was defined.')
ret, 'Neither \'dataset\' nor \'dataset_pillar\' was defined')
if merge_if_exists:
if os.path.isfile(name):