Skip to content

Commit

Permalink
updateBuildTag: convert proc.stdout.read() to str.
Browse files Browse the repository at this point in the history
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

Change-Id: Ib53e0012dd32883559c5fb9d82beb6f2d8881921
Signed-off-by: Marty E. Plummer <hanetzer@startmail.com>
Signed-off-by: vinaybs6 <vinaybs6@in.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/89363
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Srikantha S. Meesala <srikantha@in.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: RAJA DAS <rajadas2@in.ibm.com>
  • Loading branch information
hanetzer authored and RAJA DAS committed Jan 10, 2020
1 parent 26de881 commit 629327d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/build/updateBuildTag.py
Expand Up @@ -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)
Expand All @@ -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)
Expand Down

0 comments on commit 629327d

Please sign in to comment.