[OpenPower-Firmware] [RFC PATCH 6/6] updateBuildTag: convert proc.stdout.read() to str.
Marty E. Plummer
hanetzer at startmail.com
Fri May 10 19:35:09 AEST 2019
In python2.7, proc.stdout.read() returns a str type. On python3.x, it
returns bytes.
Without this change, building with python3.x (python3.5 tested) as
/usr/bin/python will result in the following error:
Traceback (most recent call last):
File "./updateBuildTag.py", line 76, in <module>
updateBuildTag(sys.argv)
File "./updateBuildTag.py", line 62, in updateBuildTag
cmd_build_tag = cmd_build_tag+" "+commit_id
TypeError: Can't convert 'bytes' object to str implicitly
Signed-off-by: Marty E. Plummer <hanetzer at startmail.com>
---
src/build/updateBuildTag.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/build/updateBuildTag.py b/src/build/updateBuildTag.py
index d6dbab95..cedb6be9 100755
--- a/src/build/updateBuildTag.py
+++ b/src/build/updateBuildTag.py
@@ -51,14 +51,14 @@ def updateBuildTag(argv):
tag_exist_cmd = "git log | grep \"Release notes for sbe\"| awk '{ print $NF }'"
proc = subprocess.Popen(tag_exist_cmd, shell=True, stdout=subprocess.PIPE)
- build_tag = proc.stdout.read()
+ build_tag = str(proc.stdout.read())
if ( build_tag ):
cmd_build_tag = cmd_build_tag+" "+build_tag
else:
commit_id_cmd = "git log |grep commit -m1 |awk '{ print $NF }' |awk '{print substr ($0, 0, 17)}'"
proc = subprocess.Popen(commit_id_cmd, shell=True, stdout=subprocess.PIPE)
- commit_id = proc.stdout.read()
+ commit_id = str(proc.stdout.read())
cmd_build_tag = cmd_build_tag+" "+commit_id
proc = subprocess.Popen(cmd_build_tag, shell=True, stdout=subprocess.PIPE)
@@ -68,7 +68,7 @@ def updateBuildTag(argv):
proc = subprocess.Popen(cmd_build_time, shell=True, stdout=subprocess.PIPE)
cmd_temp = "id -un"
proc = subprocess.Popen(cmd_temp, shell=True, stdout=subprocess.PIPE)
- cmd_build_user = cmd_build_user+" "+proc.stdout.read()
+ cmd_build_user = cmd_build_user+" "+str(proc.stdout.read())
proc = subprocess.Popen(cmd_build_user, shell=True, stdout=subprocess.PIPE)
cmd_build_host = cmd_build_host+" "+socket.gethostname()
proc = subprocess.Popen(cmd_build_host, shell=True, stdout=subprocess.PIPE)
--
2.21.0
More information about the OpenPower-Firmware
mailing list