valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Type mess in git.latest

Browse Source 
Did not get why, but we can have a list of comments instead of stings.

This fixes:
```
     line 107, in _uptodate\n    ret['comment'] += '\\n\\nChanges made: ' + comments\nTypeError:
      cannot concatenate 'str' and 'list' objects\n"
    duration: 366.804
    name: https://github.com/makinacorpus/makina-states.git
    result: false
```
This commit is contained in:
Mathieu Le Marec - Pasquet 2015-12-16 12:52:20 +01:00 committed by rallytime
parent 50f48c4bf3
commit 4c5e277367
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/states/git.py
View File

@ -104,6 +104,8 @@ 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