From ae332d1f8830448877d4c1aa74017cf6fc8af6f2 Mon Sep 17 00:00:00 2001 From: rallytime Date: Wed, 1 Jun 2016 09:58:47 -0400 Subject: [PATCH] Handle non-ascii package names in state.format_log Fixes #33605 --- salt/state.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/salt/state.py b/salt/state.py index 7a52ebd477..b2511bf92b 100644 --- a/salt/state.py +++ b/salt/state.py @@ -233,8 +233,7 @@ def format_log(ret): new = chg[pkg]['new'] if not new and new not in (False, None): new = 'absent' - msg += '\'{0}\' changed from \'{1}\' to ' \ - '\'{2}\'\n'.format(pkg, old, new) + msg += u'\'{0}\' changed from \'{1}\' to \'{2}\'\n'.format(pkg, old, new) if not msg: msg = str(ret['changes']) if ret['result'] is True or ret['result'] is None: