Commit c838b5ff authored by Oleg Dzhimiev's avatar Oleg Dzhimiev

update for python3: string needed decoding from bytes

parent dcf775a5
......@@ -178,12 +178,12 @@ def update_branch(names_from_conf,name_from_list,pars,git_proto):
print(bcolors.BOLDWHITE+"Step 0: Running self git pull"+bcolors.ENDC)
selfpullresult = subprocess.check_output("git pull",shell=True)
if selfpullresult.strip()!="Already up-to-date." and \
selfpullresult.strip()!="Already up to date.":
print(bcolors.WARNING+"Wasn't up-to-date. Please, rerun ./setup.py"+bcolors.ENDC)
sys.exit()
if selfpullresult.strip().decode('utf-8')!="Already up-to-date." and \
selfpullresult.strip().decode('utf-8')!="Already up to date.":
print(bcolors.WARNING+"Wasn't up-to-date. Please, rerun ./setup.py"+bcolors.ENDC)
sys.exit()
else:
print("ok")
print("ok")
project_branches = read_local_conf("poky/build/conf/local.conf","ELPHEL393_branches")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment