diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-06-02 13:13:00 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-03 13:13:31 +0100 |
commit | 3e309e0aad0628abdfb42ab1e63bad194aefa1cc (patch) | |
tree | ef87ca31dc945b61b9a618c59b06f8b7c065353c | |
parent | 3af9f6b88fcc5d7fddff01595f9bcf2aba548720 (diff) | |
download | openembedded-core-contrib-3e309e0aad0628abdfb42ab1e63bad194aefa1cc.tar.gz |
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 meta-yocto rev: 1de9d0b4ad289c56907d082748cdc0111988cb4f)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | scripts/lib/bsp/kernel.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/lib/bsp/kernel.py b/scripts/lib/bsp/kernel.py index fe7133da14..91cc79ca94 100644 --- a/scripts/lib/bsp/kernel.py +++ b/scripts/lib/bsp/kernel.py @@ -49,7 +49,7 @@ def find_bblayers(): bitbake_env_cmd = "bitbake -e" bitbake_env_lines = subprocess.Popen(bitbake_env_cmd, shell=True, - stdout=subprocess.PIPE).stdout.read() + stdout=subprocess.PIPE).stdout.read().decode('utf-8') if not bitbake_env_lines: print("Couldn't get '%s' output, exiting." % bitbake_env_cmd) @@ -734,7 +734,7 @@ def yocto_kernel_available_features_list(scripts_path, machine): feature_url = find_feature_url(giturl) feature_cmd = "wget -q -O - " + feature_url - tmp = subprocess.Popen(feature_cmd, shell=True, stdout=subprocess.PIPE).stdout.read() + tmp = subprocess.Popen(feature_cmd, shell=True, stdout=subprocess.PIPE).stdout.read().decode('utf-8') print("The current set of kernel features available to %s is:\n" % machine) @@ -785,7 +785,7 @@ def get_feature_desc(git_url, feature): """ feature_desc_url = find_feature_desc_url(git_url, feature) feature_desc_cmd = "wget -q -O - " + feature_desc_url - tmp = subprocess.Popen(feature_desc_cmd, shell=True, stdout=subprocess.PIPE).stdout.read() + tmp = subprocess.Popen(feature_desc_cmd, shell=True, stdout=subprocess.PIPE).stdout.read().decode('utf-8') return find_feature_desc(tmp.split("\n")) @@ -1001,7 +1001,7 @@ def base_branches(context): print("Getting branches from remote repo %s..." % giturl) gitcmd = "git ls-remote %s *heads* 2>&1" % (giturl) - tmp = subprocess.Popen(gitcmd, shell=True, stdout=subprocess.PIPE).stdout.read() + tmp = subprocess.Popen(gitcmd, shell=True, stdout=subprocess.PIPE).stdout.read().decode('utf-8') branches = [] @@ -1031,7 +1031,7 @@ def all_branches(context): print("Getting branches from remote repo %s..." % giturl) gitcmd = "git ls-remote %s *heads* 2>&1" % (giturl) - tmp = subprocess.Popen(gitcmd, shell=True, stdout=subprocess.PIPE).stdout.read() + tmp = subprocess.Popen(gitcmd, shell=True, stdout=subprocess.PIPE).stdout.read().decode('utf-8') branches = [] |