diff options
| author | Andrew Bogott <abogott@wikimedia.org> | 2012-07-08 07:05:15 -0500 |
|---|---|---|
| committer | Andrew Bogott <abogott@wikimedia.org> | 2012-07-08 07:05:15 -0500 |
| commit | 8b6af1f148cb50fc8c1e361101bfaddaafbe8569 (patch) | |
| tree | c8faf7bcdcc6db8147524b7299fab50781d82134 /nova/openstack | |
| parent | 647684adf2514fe9f0a1f142871f489bcd4a1c1a (diff) | |
| download | nova-8b6af1f148cb50fc8c1e361101bfaddaafbe8569.tar.gz nova-8b6af1f148cb50fc8c1e361101bfaddaafbe8569.tar.xz nova-8b6af1f148cb50fc8c1e361101bfaddaafbe8569.zip | |
Propagate setup.py change from common.
This pulls in the following patch:
commit 8a967b16dc2ffd60bc19bee09f45e665ddcc9a81
Author: Monty Taylor <mordred@inaugust.com>
Date: Mon Jul 2 17:19:06 2012 -0400
Fix up openstack-common build.
Ironically enough, even though the code to manage this is in
openstack-common, openstack-common wasn't using it. This patch fixes doc
generation, as well as setuptools-git integration and versioning.
Change-Id: Ibb2041b131c67aba963e2dd81dcdfd105e1f9b33
Diffstat (limited to 'nova/openstack')
| -rw-r--r-- | nova/openstack/common/setup.py | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/nova/openstack/common/setup.py b/nova/openstack/common/setup.py index 140d37b2d..2be72e61a 100644 --- a/nova/openstack/common/setup.py +++ b/nova/openstack/common/setup.py @@ -139,8 +139,14 @@ def _get_git_next_version_suffix(branch_name): if not milestonever: milestonever = "" post_version = _get_git_post_version() - revno = post_version.split(".")[-1] - return "%s~%s.%s%s" % (milestonever, datestamp, revno_prefix, revno) + # post version should look like: + # 0.1.1.4.gcc9e28a + # where the bit after the last . is the short sha, and the bit between + # the last and second to last is the revno count + (revno, sha) = post_version.split(".")[-2:] + first_half = "%(milestonever)s~%(datestamp)s" % locals() + second_half = "%(revno_prefix)s%(revno)s.%(sha)s" % locals() + return ".".join((first_half, second_half)) def _get_git_current_tag(): @@ -162,11 +168,12 @@ def _get_git_post_version(): cmd = "git --no-pager log --oneline" out = _run_shell_command(cmd) revno = len(out.split("\n")) + sha = _run_shell_command("git describe --always") else: tag_infos = tag_info.split("-") base_version = "-".join(tag_infos[:-2]) - revno = tag_infos[-2] - return "%s.%s" % (base_version, revno) + (revno, sha) = tag_infos[-2:] + return "%s.%s.%s" % (base_version, revno, sha) def write_git_changelog(): @@ -313,7 +320,8 @@ def get_git_branchname(): def get_pre_version(projectname, base_version): - """Return a version which is based""" + """Return a version which is leading up to a version that will + be released in the future.""" if os.path.isdir('.git'): current_tag = _get_git_current_tag() if current_tag is not None: @@ -325,10 +333,10 @@ def get_pre_version(projectname, base_version): version_suffix = _get_git_next_version_suffix(branch_name) version = "%s~%s" % (base_version, version_suffix) write_versioninfo(projectname, version) - return version.split('~')[0] + return version else: version = read_versioninfo(projectname) - return version.split('~')[0] + return version def get_post_version(projectname): |