summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-06-02 13:13:00 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-03 13:13:31 +0100
commit3e309e0aad0628abdfb42ab1e63bad194aefa1cc (patch)
treeef87ca31dc945b61b9a618c59b06f8b7c065353c /scripts
parent3af9f6b88fcc5d7fddff01595f9bcf2aba548720 (diff)
downloadpoky-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>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/bsp/kernel.py10
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():
49 49
50 bitbake_env_cmd = "bitbake -e" 50 bitbake_env_cmd = "bitbake -e"
51 bitbake_env_lines = subprocess.Popen(bitbake_env_cmd, shell=True, 51 bitbake_env_lines = subprocess.Popen(bitbake_env_cmd, shell=True,
52 stdout=subprocess.PIPE).stdout.read() 52 stdout=subprocess.PIPE).stdout.read().decode('utf-8')
53 53
54 if not bitbake_env_lines: 54 if not bitbake_env_lines:
55 print("Couldn't get '%s' output, exiting." % bitbake_env_cmd) 55 print("Couldn't get '%s' output, exiting." % bitbake_env_cmd)
@@ -734,7 +734,7 @@ def yocto_kernel_available_features_list(scripts_path, machine):
734 feature_url = find_feature_url(giturl) 734 feature_url = find_feature_url(giturl)
735 735
736 feature_cmd = "wget -q -O - " + feature_url 736 feature_cmd = "wget -q -O - " + feature_url
737 tmp = subprocess.Popen(feature_cmd, shell=True, stdout=subprocess.PIPE).stdout.read() 737 tmp = subprocess.Popen(feature_cmd, shell=True, stdout=subprocess.PIPE).stdout.read().decode('utf-8')
738 738
739 print("The current set of kernel features available to %s is:\n" % machine) 739 print("The current set of kernel features available to %s is:\n" % machine)
740 740
@@ -785,7 +785,7 @@ def get_feature_desc(git_url, feature):
785 """ 785 """
786 feature_desc_url = find_feature_desc_url(git_url, feature) 786 feature_desc_url = find_feature_desc_url(git_url, feature)
787 feature_desc_cmd = "wget -q -O - " + feature_desc_url 787 feature_desc_cmd = "wget -q -O - " + feature_desc_url
788 tmp = subprocess.Popen(feature_desc_cmd, shell=True, stdout=subprocess.PIPE).stdout.read() 788 tmp = subprocess.Popen(feature_desc_cmd, shell=True, stdout=subprocess.PIPE).stdout.read().decode('utf-8')
789 789
790 return find_feature_desc(tmp.split("\n")) 790 return find_feature_desc(tmp.split("\n"))
791 791
@@ -1001,7 +1001,7 @@ def base_branches(context):
1001 print("Getting branches from remote repo %s..." % giturl) 1001 print("Getting branches from remote repo %s..." % giturl)
1002 1002
1003 gitcmd = "git ls-remote %s *heads* 2>&1" % (giturl) 1003 gitcmd = "git ls-remote %s *heads* 2>&1" % (giturl)
1004 tmp = subprocess.Popen(gitcmd, shell=True, stdout=subprocess.PIPE).stdout.read() 1004 tmp = subprocess.Popen(gitcmd, shell=True, stdout=subprocess.PIPE).stdout.read().decode('utf-8')
1005 1005
1006 branches = [] 1006 branches = []
1007 1007
@@ -1031,7 +1031,7 @@ def all_branches(context):
1031 print("Getting branches from remote repo %s..." % giturl) 1031 print("Getting branches from remote repo %s..." % giturl)
1032 1032
1033 gitcmd = "git ls-remote %s *heads* 2>&1" % (giturl) 1033 gitcmd = "git ls-remote %s *heads* 2>&1" % (giturl)
1034 tmp = subprocess.Popen(gitcmd, shell=True, stdout=subprocess.PIPE).stdout.read() 1034 tmp = subprocess.Popen(gitcmd, shell=True, stdout=subprocess.PIPE).stdout.read().decode('utf-8')
1035 1035
1036 branches = [] 1036 branches = []
1037 1037