openstack
/
osc-lib
Code Issues Proposed changes

Merge "Use install_venv_common.py from oslo."

This commit is contained in:
Jenkins 2013-01-30 15:43:59 +00:00 committed by Gerrit Code Review
parent d32cbac3fd 78086a8e89
commit ceac8a7f89
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
openstackclient/openstack/common/setup.py
View File

@ -258,6 +258,22 @@ def get_cmdclass():
return cmdclass return cmdclass
def _get_revno():
"""Return the number of commits since the most recent tag.
We use git-describe to find this out, but if there are no
tags then we fall back to counting commits since the beginning
of time.
"""
describe = _run_shell_command("git describe --always")
if "-" in describe:
return describe.rsplit("-", 2)[-2]
# no tags found
revlist = _run_shell_command("git rev-list --abbrev-commit HEAD")
return len(revlist.splitlines())
def get_version_from_git(pre_version): def get_version_from_git(pre_version):
"""Return a version which is equal to the tag that's on the current """Return a version which is equal to the tag that's on the current
revision if there is one, or tag plus number of additional revisions revision if there is one, or tag plus number of additional revisions
@ -271,9 +287,7 @@ def get_version_from_git(pre_version):
throw_on_error=True).replace('-', '.') throw_on_error=True).replace('-', '.')
except Exception: except Exception:
sha = _run_shell_command("git log -n1 --pretty=format:%h") sha = _run_shell_command("git log -n1 --pretty=format:%h")
describe = _run_shell_command("git describe --always") return "%s.a%s.g%s" % (pre_version, _get_revno(), sha)
revno = describe.rsplit("-", 2)[-2]
return "%s.a%s.g%s" % (pre_version, revno, sha)
else: else:
return _run_shell_command( return _run_shell_command(
"git describe --always").replace('-', '.') "git describe --always").replace('-', '.')