summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/image-build/build-vyos-image9
1 files changed, 6 insertions, 3 deletions
diff --git a/scripts/image-build/build-vyos-image b/scripts/image-build/build-vyos-image
index 8ac5d4dc..469e4a3b 100755
--- a/scripts/image-build/build-vyos-image
+++ b/scripts/image-build/build-vyos-image
@@ -485,9 +485,12 @@ def build():
with open('../data/versions') as f:
version_mapping = json.load(f)
- branch_version = version_mapping[git_branch]
-
- version = "{0}-rolling-{1}".format(branch_version, build_timestamp)
+ # Branches without a mapping (e.g. rolling) use the default version
+ branch_version = version_mapping.get(git_branch)
+ if branch_version:
+ version = "{0}-rolling-{1}".format(branch_version, build_timestamp)
+ else:
+ version = "999.{0}".format(build_timestamp)
except Exception as e:
print("W: Could not build a version string specific to git branch, falling back to default: {0}".format(str(e)))
version = "999.{0}".format(build_timestamp)