vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

build: T3664: fix regression and bug in clone vyos-1x repo

Browse Source
This commit is contained in:
John Estabrook 2024-05-03 15:06:16 -05:00
parent b9e60960fa
commit 02c340d9d7
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/image-build/build-vyos-image
View File

@ -66,7 +66,17 @@ try:
branch_name = build_defaults['vyos_branch'] branch_name = build_defaults['vyos_branch']
url_vyos_1x = 'https://github.com/vyos/vyos-1x' url_vyos_1x = 'https://github.com/vyos/vyos-1x'
path_vyos_1x = os.path.join(defaults.BUILD_DIR, 'vyos-1x') path_vyos_1x = os.path.join(defaults.BUILD_DIR, 'vyos-1x')
try:
repo_vyos_1x = git.Repo.clone_from(url_vyos_1x, path_vyos_1x, no_checkout=True) repo_vyos_1x = git.Repo.clone_from(url_vyos_1x, path_vyos_1x, no_checkout=True)
except git.GitCommandError:
if os.path.exists(path_vyos_1x):
try:
repo_vyos_1x = git.Repo(path_vyos_1x)
except git.GitError:
print(f'E: Corrupted vyos-1x git repo: {path_vyos_1x}; remove')
sys.exit(1)
else:
raise
# alternatively, pass commit hash or tag as arg: # alternatively, pass commit hash or tag as arg:
repo_vyos_1x.git.checkout(branch_name) repo_vyos_1x.git.checkout(branch_name)
except Exception as e: except Exception as e:
@ -368,7 +378,7 @@ if __name__ == "__main__":
# Initialize Git object from our repository # Initialize Git object from our repository
try: try:
repo = git.Repo('.') repo = git.Repo('.', search_parent_directories=True)
# Retrieve the Git commit ID of the repository, 14 charaters will be sufficient # Retrieve the Git commit ID of the repository, 14 charaters will be sufficient
build_git = repo.head.object.hexsha[:14] build_git = repo.head.object.hexsha[:14]
# If somone played around with the source tree and the build is "dirty", mark it # If somone played around with the source tree and the build is "dirty", mark it