summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2024-04-10 10:26:24 -0500
committerDaniil Baturin <daniil@vyos.io>2024-04-13 12:55:29 +0000
commit7fa66c77f19694e2cfd275785344f53518b7fb2f (patch)
tree2bb7528c6ea6e5785f94d973bc0832a5ce0dbde0 /scripts
parenta896176ad8a1e1c7ef440a31c5afcfad358ed309 (diff)
downloadvyos-build-7fa66c77f19694e2cfd275785344f53518b7fb2f.tar.gz
vyos-build-7fa66c77f19694e2cfd275785344f53518b7fb2f.zip
Account for the working dir below the root in git invocation
Signed-off-by: Daniil Baturin <daniil@vyos.io>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/image-build/build-vyos-image4
1 files changed, 2 insertions, 2 deletions
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 = ""