* [PATCH] buildcfg: get_metadata_git_*: catch also bb.process.NotFoundError
@ 2025-04-15 19:47 martin.jansa
0 siblings, 0 replies; only message in thread
From: martin.jansa @ 2025-04-15 19:47 UTC (permalink / raw)
To: openembedded-core; +Cc: Martin Jansa
From: Martin Jansa <martin.jansa@gmail.com>
* bb.process.NotFoundError is triggered when e.g. oe.buildcfg.get_metadata_git_branch
is called on non-existent directory
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
---
meta/lib/oe/buildcfg.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta/lib/oe/buildcfg.py b/meta/lib/oe/buildcfg.py
index 4b22f18f36..85b903fab0 100644
--- a/meta/lib/oe/buildcfg.py
+++ b/meta/lib/oe/buildcfg.py
@@ -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()
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2025-04-15 19:47 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-04-15 19:47 [PATCH] buildcfg: get_metadata_git_*: catch also bb.process.NotFoundError martin.jansa
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox