diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2012-12-17 12:17:59 +0000 |
|---|---|---|
| committer | Daniel P. Berrange <berrange@redhat.com> | 2012-12-19 18:54:17 +0000 |
| commit | 481d6ff142b8daeb08b22001997b5cf701a6d134 (patch) | |
| tree | 8b6f8fc1389817475bc4b7d7f596c6b505cd36dc /nova/version.py | |
| parent | ba9ee7eb22ca17553e2e768365220c9a9838ae1d (diff) | |
| download | nova-481d6ff142b8daeb08b22001997b5cf701a6d134.tar.gz nova-481d6ff142b8daeb08b22001997b5cf701a6d134.tar.xz nova-481d6ff142b8daeb08b22001997b5cf701a6d134.zip | |
Remove obsolete VCS version info completely
The VCS version string in nova/version.py has been hardcoded
to 'LOCALBRANCH:LOCALVERSION' since change
0bbb0e8cb1daa351af91cf97b2bcababfc0c7f9f
The only places which use this info are some logging calls,
and since 'nova-manager version' command. The latter would
more usefully output the distro specific package string.
Delete the VCS related methods in version.py and replace their
usage with a new method version_string_with_package() which
appends the distro-specific package tag
Change-Id: I972b79c329198cb5376d537c6b672830094cd759
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Diffstat (limited to 'nova/version.py')
| -rw-r--r-- | nova/version.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/nova/version.py b/nova/version.py index eb05058f3..16b0d876a 100644 --- a/nova/version.py +++ b/nova/version.py @@ -45,9 +45,8 @@ def version_string(): return '%s-dev' % (canonical_version_string(),) -def vcs_version_string(): - return 'LOCALBRANCH:LOCALREVISION' - - -def version_string_with_vcs(): - return '%s-%s' % (canonical_version_string(), vcs_version_string()) +def version_string_with_package(): + if package_string() is None: + return canonical_version_string() + else: + return "%s-%s" % (canonical_version_string(), package_string()) |