From 7fa66c77f19694e2cfd275785344f53518b7fb2f Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Wed, 10 Apr 2024 10:26:24 -0500 Subject: Account for the working dir below the root in git invocation Signed-off-by: Daniil Baturin --- scripts/image-build/build-vyos-image | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/image-build') diff --git a/scripts/image-build/build-vyos-image b/scripts/image-build/build-vyos-image index aa397843..229bc2bc 100755 --- a/scripts/image-build/build-vyos-image +++ b/scripts/image-build/build-vyos-image @@ -331,7 +331,7 @@ if __name__ == "__main__": # Initialize Git object from our repository try: - repo = git.Repo('.') + repo = git.Repo('.', search_parent_directories=True) # Retrieve the Git commit ID of the repository, 14 charaters will be sufficient build_git = repo.head.object.hexsha[:14] @@ -346,7 +346,7 @@ if __name__ == "__main__": if git_branch is None: git_branch = repo.active_branch.name except Exception as e: - exit(f'Could not retrieve information from git: {e}') + exit(f'Could not retrieve information from git: {repr(e)}') build_git = "" git_branch = "" -- cgit v1.2.3