scripts: python3: decode subprocess output
stdeout and stderr content returned by subprocess API has different types in Python 3(bytes) and Python 2(string). Decoding it to 'utf-8' makes it unicode on both pythons. (From OE-Core rev: ae4d36375683b6cfd48af25bfca70b2e77f7ade5) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
a8314b9531
commit
4e36eeee77
|
@ -45,7 +45,7 @@ def run_command(cmd):
|
||||||
if pipe.returncode != 0:
|
if pipe.returncode != 0:
|
||||||
print("Execute command '%s' failed." % cmd)
|
print("Execute command '%s' failed." % cmd)
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
return output
|
return output.decode('utf-8')
|
||||||
|
|
||||||
def get_cur_arch_dirs(workdir, arch_dirs):
|
def get_cur_arch_dirs(workdir, arch_dirs):
|
||||||
pattern = workdir + '/(.*?)/'
|
pattern = workdir + '/(.*?)/'
|
||||||
|
|
|
@ -198,7 +198,7 @@ def runcmd(cmd,destdir=None,printerr=True,out=None,env=None):
|
||||||
raise e
|
raise e
|
||||||
|
|
||||||
err.seek(0)
|
err.seek(0)
|
||||||
output = err.read()
|
output = err.read().decode('utf-8')
|
||||||
logger.debug("output: %s" % output.replace(chr(0), '\\0'))
|
logger.debug("output: %s" % output.replace(chr(0), '\\0'))
|
||||||
return output
|
return output
|
||||||
|
|
||||||
|
|
|
@ -371,7 +371,7 @@ def coverage_setup(coverage_source, coverage_include, coverage_omit):
|
||||||
import subprocess
|
import subprocess
|
||||||
builddir = os.environ.get("BUILDDIR")
|
builddir = os.environ.get("BUILDDIR")
|
||||||
pokydir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
|
pokydir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
|
||||||
curcommit= subprocess.check_output(["git", "--git-dir", os.path.join(pokydir, ".git"), "rev-parse", "HEAD"])
|
curcommit= subprocess.check_output(["git", "--git-dir", os.path.join(pokydir, ".git"), "rev-parse", "HEAD"]).decode('utf-8')
|
||||||
coveragerc = "%s/.coveragerc" % builddir
|
coveragerc = "%s/.coveragerc" % builddir
|
||||||
data_file = "%s/.coverage." % builddir
|
data_file = "%s/.coverage." % builddir
|
||||||
data_file += datetime.datetime.now().strftime('%Y%m%dT%H%M%S')
|
data_file += datetime.datetime.now().strftime('%Y%m%dT%H%M%S')
|
||||||
|
|
Loading…
Reference in New Issue