MIRRORS/layerindex-web
1
0
Fork 0
mirror of git://git.yoctoproject.org/layerindex-web.git synced 2025-07-19 12:49:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

utils.py: Fix for is_commit_ancestor()

Browse Source 
The runcmd() would print an "ERROR" on failure which causes confusion since
the failure is expected on old branches, so subprocess.getstatusoutput to fix
the problem.

Minor rewording.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Tim Orling <tim.orling@konsulko.com>
This commit is contained in:
Robert Yang 2022-12-16 08:42:53 -08:00 committed by Tim Orling
parent 2d7906ff3b
commit 61c857a7df
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
layerindex/utils.py
View File

@ -243,16 +243,18 @@ def is_commit_ancestor(repodir, commit, logger):
# check if commit is a sha1 hash
if re.match('[0-9a-f]{40}', commit):
# check if the commit is an ancestor
contained = runcmd(['git', 'merge-base', '--is-ancestor', '%s' % commit, 'HEAD'], repodir, logger=logger)
return True
else:
raise Exception('is_commit_ancestor: "commit" must be a SHA1 hash')
except subprocess.CalledProcessError as e:
if e.returncode == 1:
# commit is not an ancestor
cmd = "GIT_DIR=%s/.git git merge-base --is-ancestor %s HEAD" % (repodir, commit)
logger.debug('Running "%s"' % cmd)
ret, output = subprocess.getstatusoutput(cmd)
if ret == 0:
return True
elif ret == 1:
logger.debug('output: %s' % output)
return False
else:
raise e
raise Exception('Failed to run command: %s: ret: %s, output: %s' % (cmd, ret, output))
else:
raise Exception('is_commit_ancestor: "commit" must be a SHA1 hash')
except Exception as esc:
logger.warn(esc)