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

buildcfg: get_metadata_git_*: catch also bb.process.NotFoundError

Browse Source 
* bb.process.NotFoundError is triggered when e.g. oe.buildcfg.get_metadata_git_branch
  is called on non-existent directory

(From OE-Core rev: 34c1f66c4c689b26a4c3129eb62f4ff9b6ec14be)

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Martin Jansa 2025-04-15 21:47:26 +02:00 committed by Richard Purdie
parent 706085aaf7
commit f4d8e84fd9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meta/lib/oe/buildcfg.py
View File

@ -17,21 +17,21 @@ def get_scmbasepath(d):
def get_metadata_git_branch(path):
try:
rev, _ = bb.process.run('git rev-parse --abbrev-ref HEAD', cwd=path)
except bb.process.ExecutionError:
except (bb.process.ExecutionError, bb.process.NotFoundError):
rev = '<unknown>'
return rev.strip()
def get_metadata_git_revision(path):
try:
rev, _ = bb.process.run('git rev-parse HEAD', cwd=path)
except bb.process.ExecutionError:
except (bb.process.ExecutionError, bb.process.NotFoundError):
rev = '<unknown>'
return rev.strip()
def get_metadata_git_toplevel(path):
try:
toplevel, _ = bb.process.run('git rev-parse --show-toplevel', cwd=path)
except bb.process.ExecutionError:
except (bb.process.ExecutionError, bb.process.NotFoundError):
return ""
return toplevel.strip()
@ -39,21 +39,21 @@ def get_metadata_git_remotes(path):
try:
remotes_list, _ = bb.process.run('git remote', cwd=path)
remotes = remotes_list.split()
except bb.process.ExecutionError:
except (bb.process.ExecutionError, bb.process.NotFoundError):
remotes = []
return remotes
def get_metadata_git_remote_url(path, remote):
try:
uri, _ = bb.process.run('git remote get-url {remote}'.format(remote=remote), cwd=path)
except bb.process.ExecutionError:
except (bb.process.ExecutionError, bb.process.NotFoundError):
return ""
return uri.strip()
def get_metadata_git_describe(path):
try:
describe, _ = bb.process.run('git describe --tags --dirty', cwd=path)
except bb.process.ExecutionError:
except (bb.process.ExecutionError, bb.process.NotFoundError):
return ""
return describe.strip()