diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-11 02:32:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-11 02:32:04 +0000 |
| commit | e650657862b0d9c070f70fe078af56c55fb02e73 (patch) | |
| tree | 1eb37a304fc83fdf6f5b5dd4a632adb969e18ebe /openstack/common/setup.py | |
| parent | 9c727b28e83f08dcd7d247546557af54428c2417 (diff) | |
| parent | a4b6c313199dbc59e3adfc371d76d2b96df7697c (diff) | |
| download | oslo-e650657862b0d9c070f70fe078af56c55fb02e73.tar.gz oslo-e650657862b0d9c070f70fe078af56c55fb02e73.tar.xz oslo-e650657862b0d9c070f70fe078af56c55fb02e73.zip | |
Merge "Allow running test in uninstalled source tree."
Diffstat (limited to 'openstack/common/setup.py')
| -rw-r--r-- | openstack/common/setup.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/openstack/common/setup.py b/openstack/common/setup.py index fb187ff..35680b3 100644 --- a/openstack/common/setup.py +++ b/openstack/common/setup.py @@ -274,7 +274,7 @@ def _get_revno(): 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 revision if there is one, or tag plus number of additional revisions if the current revision has no tag.""" @@ -294,7 +294,7 @@ def get_version_from_git(pre_version): return None -def get_version_from_pkg_info(package_name): +def _get_version_from_pkg_info(package_name): """Get the version from PKG-INFO file if we can.""" try: pkg_info_file = open('PKG-INFO', 'r') @@ -325,10 +325,10 @@ def get_version(package_name, pre_version=None): version = os.environ.get("OSLO_PACKAGE_VERSION", None) if version: return version - version = get_version_from_pkg_info(package_name) + version = _get_version_from_pkg_info(package_name) if version: return version - version = get_version_from_git(pre_version) + version = _get_version_from_git(pre_version) if version: return version raise Exception("Versioning for this project requires either an sdist" |
