Merge pull request #25921 from cachedout/issue_25810

Handle non-ascii in state log
This commit is contained in:
Justin Findlay 2015-07-31 11:41:30 -06:00
commit 331fc121a8

View file

@ -205,8 +205,8 @@ def format_log(ret):
for pkg in chg:
old = chg[pkg]['old'] or 'absent'
new = chg[pkg]['new'] or 'absent'
msg += '{0} changed from {1} to ' \
'{2}\n'.format(pkg, old, new)
msg += '{0!r} changed from {1!r} to ' \
'{2!r}\n'.format(pkg, old, new)
if not msg:
msg = str(ret['changes'])
if ret['result'] is True or ret['result'] is None: