Commit d78dc363 authored by Josh Holmer's avatar Josh Holmer Committed by Thomas Daede

Fix issue where AWCY script fails with str concat and fails if multiple

attempts with same commit
parent 01fe6015
...@@ -57,12 +57,11 @@ if args.prefix is None: ...@@ -57,12 +57,11 @@ if args.prefix is None:
args.prefix = args.branch args.prefix = args.branch
commit = subprocess.check_output('git rev-parse HEAD',shell=True).strip() commit = subprocess.check_output('git rev-parse HEAD',shell=True).strip()
short = subprocess.check_output('git rev-parse --short HEAD',shell=True).strip() short = subprocess.check_output('git rev-parse --short HEAD',shell=True).strip().decode("utf-8")
date = subprocess.check_output(['git','show','-s','--format=%ci',commit]).strip() date = GetTime().strip()
date_short = date.split()[0] date_short = date.split()[0]+'_'+date.split()[1].split('.')[0].replace(':', '')
user = args.prefix user = args.prefix
is_master = args.master is_master = args.master
run_id = user+'-'+date_short+'-'+short run_id = user+'-'+date_short+'-'+short
print(GetTime(), 'Creating run '+run_id) print(GetTime(), 'Creating run '+run_id)
......
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