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 #5127 from hulu/file-comment-shadowing

Browse Source 
file state: comment => comment_, to avoid shadowing outer func
This commit is contained in:
Thomas S Hatch 2013-05-17 20:40:27 -07:00
commit f2b62412dc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/states/file.py
View File

@ -790,7 +790,7 @@ def managed(name,
)
# Gather the source file from the server
sfn, source_sum, comment = __salt__['file.get_managed'](
sfn, source_sum, comment_ = __salt__['file.get_managed'](
name,
template,
source,
@ -803,8 +803,8 @@ def managed(name,
defaults,
**kwargs
)
if comment and contents is None:
return _error(ret, comment)
if comment_ and contents is None:
return _error(ret, comment_)
else:
return __salt__['file.manage_file'](name,
sfn,