openstack
/
instack-undercloud
Code Issues Proposed changes

Merge "Explicitly decode to utf-8" into stable/liberty

This commit is contained in:
Jenkins 2016-03-14 21:47:10 +00:00 committed by Gerrit Code Review
parent d7eb2f128f 85eb5a6fd6
commit 16a8684f2b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
instack_undercloud/undercloud.py
View File

@ -342,7 +342,7 @@ def _run_command(args, env=None, name=None):
try:
return subprocess.check_output(args,
stderr=subprocess.STDOUT,
env=env).decode()
env=env).decode('utf-8')
except subprocess.CalledProcessError as e:
LOG.error('%s failed: %s', name, e.output)
raise
@ -361,7 +361,7 @@ def _run_live_command(args, env=None, name=None):
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT)
while True:
line = process.stdout.readline().decode()
line = process.stdout.readline().decode('utf-8')
if line:
LOG.info(line.rstrip())
if line == '' and process.poll() is not None: