openstack/python-cinderclient
Code Issues Proposed changes

Update to swapped versioninfo logic.

Browse Source 
Change-Id: I6a8dd1c84df0a92c21f468c7dcad1ce79f69c463
This commit is contained in:
Monty Taylor
2012-11-30 14:22:54 -08:00
parent 5adf791360
commit 9201cee6ef
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cinderclient/openstack/common/setup.py
View File

@@ -237,7 +237,7 @@ def read_versioninfo(project):
with open(versioninfo_path, 'r') as vinfo: with open(versioninfo_path, 'r') as vinfo:
version = vinfo.read().strip() version = vinfo.read().strip()
else: else:
version = "0.0.0" version = None
return version return version
@@ -337,7 +337,8 @@ def get_git_branchname():
def get_pre_version(projectname, base_version): def get_pre_version(projectname, base_version):
"""Return a version which is leading up to a version that will """Return a version which is leading up to a version that will
be released in the future.""" be released in the future."""
if os.path.isdir('.git'): version = read_versioninfo(projectname)
if not version and os.path.isdir('.git'):
current_tag = _get_git_current_tag() current_tag = _get_git_current_tag()
if current_tag is not None: if current_tag is not None:
version = current_tag version = current_tag
@@ -348,9 +349,8 @@ def get_pre_version(projectname, base_version):
version_suffix = _get_git_next_version_suffix(branch_name) version_suffix = _get_git_next_version_suffix(branch_name)
version = "%s~%s" % (base_version, version_suffix) version = "%s~%s" % (base_version, version_suffix)
write_versioninfo(projectname, version) write_versioninfo(projectname, version)
return version if not version:
else: version = "0.0.0"
version = read_versioninfo(projectname)
return version return version
@@ -359,8 +359,10 @@ def get_post_version(projectname):
revision if there is one, or tag plus number of additional revisions revision if there is one, or tag plus number of additional revisions
if the current revision has no tag.""" if the current revision has no tag."""
if os.path.isdir('.git'): version = read_versioninfo(projectname)
if not version and os.path.isdir('.git'):
version = _get_git_post_version() version = _get_git_post_version()
write_versioninfo(projectname, version) write_versioninfo(projectname, version)
return version if not version:
return read_versioninfo(projectname) version = "0.0.0"
return version