@@ -118,9 +118,9 @@ def get_versions():
def get_app_branch(app):
def get_app_branch(app):
'''Returns branch of an app'''
'''Returns branch of an app'''
try:
try:
null_stream = open(os.devnull, 'wb')
result = subprocess.check_output('cd ../apps/{0} && git rev-parse --abbrev-ref HEAD'.format(app) ,
shell=True, stdin=null_stream, stderr=null_stream)
with open(os.devnull, 'wb') as null_stream:
result = subprocess.check_output(f'cd ../apps/{app} && git rev-parse --abbrev-ref HEAD' ,
shell=True, stdin=null_stream, stderr=null_stream)
result = safe_decode(result)
result = safe_decode(result)
result = result.strip()
result = result.strip()
return result
return result
@@ -129,9 +129,9 @@ def get_app_branch(app):
def get_app_last_commit_ref(app):
def get_app_last_commit_ref(app):
try:
try:
null_stream = open(os.devnull, 'wb')
result = subprocess.check_output('cd ../apps/{0} && git rev-parse HEAD --short 7'.format(app) ,
shell=True, stdin=null_stream, stderr=null_stream)
with open(os.devnull, 'wb') as null_stream:
result = subprocess.check_output(f'cd ../apps/{app} && git rev-parse HEAD --short 7' ,
shell=True, stdin=null_stream, stderr=null_stream)
result = safe_decode(result)
result = safe_decode(result)
result = result.strip()
result = result.strip()
return result
return result