saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Properly fix concat list issue in git state.

Browse source 
No need to check if it's a list.
Just join it before passing to _uptodate()
This commit is contained in:
Weilu Jia 2016-01-04 09:35:26 +00:00
parent 941bcaed07
commit 6c5bac4909
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/states/git.py
View file

@ -104,8 +104,6 @@ def _uptodate(ret, target, comments=None):
# Shouldn't be making any changes if the repo was up to date, but
# report on them so we are alerted to potential problems with our
# logic.
if isinstance(comments, list):
comments = '\n'.join(comments)
ret['comment'] += '\n\nChanges made: ' + str(comments)
return ret
@ -1196,7 +1194,7 @@ def latest(name,
ret['comment'] = _format_comments(comments)
ret['changes']['revision'] = {'old': local_rev, 'new': new_rev}
else:
return _uptodate(ret, target, comments)
return _uptodate(ret, target, _format_comments(comments))
else:
if os.path.isdir(target):
if force_clone: