diff options
| author | Christian Poessinger <christian@poessinger.com> | 2018-06-06 21:52:28 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2018-06-06 21:52:30 +0200 |
| commit | 3af1486d488be0ce450b0f92fed3d45221bdac9f (patch) | |
| tree | be4b5d0c857a478d7230d23bb34795be0c34aae8 /scripts | |
| parent | 7ede5bb6995b64bd0afbadd94e2cef56de168725 (diff) | |
| download | vyos-build-3af1486d488be0ce450b0f92fed3d45221bdac9f.tar.gz vyos-build-3af1486d488be0ce450b0f92fed3d45221bdac9f.zip | |
T596: replace + in new version format by -
The new version scheme was introduced in commit d2e4f63f03 ("T596: use a more
descriptive dev build version format.". It superseeded the old
999.something version numbers.
New version numbers for rolling releases are in the form of
vyos-1.2.0-rolling+201806062125-amd64.iso but the '+' sign will be
replaced by '%2B' when e.g. downloading the file via http(s), this may be
confusing.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/make-version-file | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/make-version-file b/scripts/make-version-file index 0459b8bf..bdf489d7 100755 --- a/scripts/make-version-file +++ b/scripts/make-version-file @@ -56,7 +56,7 @@ if build_config['build_type'] == 'development': git_branch = repo.active_branch.name branch_version = version_mapping[git_branch] - version = "{0}-rolling+{1}".format(branch_version, build_timestamp) + version = "{0}-rolling-{1}".format(branch_version, build_timestamp) except Exception as e: print("Could not build a version string specific to git branch, falling back to default: {0}".format(str(e))) version = "999.{0}".format(build_timestamp) @@ -71,7 +71,6 @@ version_data = { 'build_id': build_id } - with open(os.path.join(defaults.CHROOT_INCLUDES_DIR, 'opt/vyatta/etc/version.json'), 'w') as f: json.dump(version_data, f) |