Skip to content

E
elphel393
Commit 0c985037 authored by Oleg Dzhimiev's avatar Oleg Dzhimiev
Browse files
Options

more comments

parent b8c91b67
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
setup.py
View file @ 0c985037
...@@ -115,12 +115,14 @@ def update_branch(names_from_conf,name_from_list,pars,git_proto): ...@@ -115,12 +115,14 @@ def update_branch(names_from_conf,name_from_list,pars,git_proto):
#main #main
#self pull? #self pull?
print(bcolors.BOLDWHITE+"Running self git pull"+bcolors.ENDC) print(bcolors.BOLDWHITE+"Step 0: Running self git pull"+bcolors.ENDC)
selfpullresult = subprocess.check_output("git pull",shell=True) selfpullresult = subprocess.check_output("git pull",shell=True)
if selfpullresult.strip()!="Already up-to-date.": if selfpullresult.strip()!="Already up-to-date.":
print(bcolors.WARNING+"Wasn't up-to-date. Please, rerun ./setup.py"+bcolors.ENDC) print(bcolors.WARNING+"Wasn't up-to-date. Please, rerun ./setup.py"+bcolors.ENDC)
sys.exit() sys.exit()
else:
print("ok")
project_branches = read_local_conf("poky/build/conf/local.conf","ELPHEL393_branches") project_branches = read_local_conf("poky/build/conf/local.conf","ELPHEL393_branches")
git_proto = read_local_conf_dev("poky/build/conf/local.conf","ELPHEL393_DEV") git_proto = read_local_conf_dev("poky/build/conf/local.conf","ELPHEL393_DEV")
......
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