From 34c1f66c4c689b26a4c3129eb62f4ff9b6ec14be Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 15 Apr 2025 21:47:26 +0200 Subject: [PATCH] buildcfg: get_metadata_git_*: catch also bb.process.NotFoundError * 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 Signed-off-by: Richard Purdie --- 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 4b22f18f365..85b903fab05 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 = '' 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 = '' 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() -- 2.47.3