diff options
author | Scott Moser <smoser@ubuntu.com> | 2018-05-22 16:06:41 -0400 |
---|---|---|
committer | Scott Moser <smoser@brickies.net> | 2018-05-22 16:06:41 -0400 |
commit | 5446c788160412189200c6cc688b14c9f9071943 (patch) | |
tree | 4fc9a16dd57028a2adbca4cf35acbccae13d7f1e /cloudinit/version.py | |
parent | 529d48f69d3784b2314397f5eab9d750ab03cf6a (diff) | |
download | vyos-cloud-init-5446c788160412189200c6cc688b14c9f9071943.tar.gz vyos-cloud-init-5446c788160412189200c6cc688b14c9f9071943.zip |
Update version.version_string to contain packaged version.
This modifies version.version_string to support having the package
build write the *packaged* version in with a easy replace.
Then, when cloud-init reports its version it will include the full
packaged version.
Also modified here are upstream package build files to get that done.
Note part of the trickery in packages/debian/rules.in was to avoid
the 'basic' templater consuming the '$variable' variable names.
LP: #1770712
Diffstat (limited to 'cloudinit/version.py')
-rw-r--r-- | cloudinit/version.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cloudinit/version.py b/cloudinit/version.py index ccd0f84e..ce3b8c1e 100644 --- a/cloudinit/version.py +++ b/cloudinit/version.py @@ -5,6 +5,7 @@ # This file is part of cloud-init. See LICENSE file for license information. __VERSION__ = "18.2" +_PACKAGED_VERSION = '@@PACKAGED_VERSION@@' FEATURES = [ # supports network config version 1 @@ -15,6 +16,9 @@ FEATURES = [ def version_string(): + """Extract a version string from cloud-init.""" + if not _PACKAGED_VERSION.startswith('@@'): + return _PACKAGED_VERSION return __VERSION__ # vi: ts=4 expandtab |