aboutsummaryrefslogtreecommitdiffstats
path: root/libbe/util
diff options
context:
space:
mode:
authorW. Trevor King <wking@tremily.us>2013-07-29 10:09:38 -0700
committerW. Trevor King <wking@tremily.us>2013-07-29 10:09:38 -0700
commit61ac4eee6a137983b9561ad33342197c8278bdbd (patch)
treecfad7b6a29a7db9ed8d43108dcfe9097a0efb3b0 /libbe/util
parent9b5b2a1b7ca4541b4b34aa4b4f00c2d96a90d79b (diff)
parent042e66148d4014c459565b4987850fa5e69b562d (diff)
downloadbugseverywhere-61ac4eee6a137983b9561ad33342197c8278bdbd.tar.gz
Merge remote-tracking branch 'mcepl/utf8_user'
* mcepl/utf8_user: Make BE working with non-ASCII username.
Diffstat (limited to 'libbe/util')
-rw-r--r--libbe/util/subproc.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/libbe/util/subproc.py b/libbe/util/subproc.py
index f1f04c1..0ad010c 100644
--- a/libbe/util/subproc.py
+++ b/libbe/util/subproc.py
@@ -87,7 +87,9 @@ def invoke(args, stdin=None, stdout=PIPE, stderr=PIPE, expect=(0,),
stdout = unicode(stdout, encoding)
if stderr != None:
stderr = unicode(stderr, encoding)
- libbe.LOG.debug('{0}\n{1}{2}'.format(status, stdout, stderr))
+ libbe.LOG.debug(u'{0}\n{1}{2}'.format(status, stdout, stderr))
+ else:
+ libbe.LOG.debug('{0}\n{1}{2}'.format(status, stdout, stderr))
if status not in expect:
raise CommandError(list_args, status, stdout, stderr)
return status, stdout, stderr