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

Add missing chanegs from last commit.

Browse Source
This commit is contained in:
Jack Kuan 2012-08-15 12:14:40 -04:00
parent d4a0449a9a
commit b685a8fe56
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/states/file.py
View File

@ -443,7 +443,8 @@ def _check_perms(name, ret, user, group, mode):
ret['changes']['group'] = group
if isinstance(orig_comment, basestring):
ret['comment'].insert(0, orig_comment)
if orig_comment:
ret['comment'].insert(0, orig_comment)
ret['comment'] = '; '.join(ret['comment'])
return ret, perms
@ -1403,7 +1404,7 @@ def recurse(name,
_ret = {'name': name,
'changes': {},
'result': True,
'comment': []
'comment': []
}
_check_perms(path, _ret, user, group, mode)
ret['result'] &= _ret['result'] # ie, once false, stay false.