summaryrefslogtreecommitdiffstats
path: root/openstack/common
diff options
context:
space:
mode:
authorSteve Baker <sbaker@redhat.com>2013-01-04 16:16:24 +1300
committerSteve Baker <sbaker@redhat.com>2013-01-04 16:24:13 +1300
commit50c51177d5586d5703a286dc01c83e75435d4af7 (patch)
tree49358da761bbde465561cd4b90c2bce12b9b8f56 /openstack/common
parent008500197a82a0ec15822bf17a35c5a283c50910 (diff)
downloadoslo-50c51177d5586d5703a286dc01c83e75435d4af7.tar.gz
oslo-50c51177d5586d5703a286dc01c83e75435d4af7.tar.xz
oslo-50c51177d5586d5703a286dc01c83e75435d4af7.zip
Use package for writing versioninfo.
This currently fails for client projects as python_package is the name of the project, while package is where versioninfo is written to. This doesn't affect server openstack projects because python_package == package. This hasn't affected any client projects yet because most likely none of them call version.canonical_version_string() in their setup.py Change-Id: Ia97e5fae378c47909f3dbc842dc83e408af68671
Diffstat (limited to 'openstack/common')
-rw-r--r--openstack/common/version.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/openstack/common/version.py b/openstack/common/version.py
index 2c11fbc..c04a695 100644
--- a/openstack/common/version.py
+++ b/openstack/common/version.py
@@ -50,9 +50,9 @@ class VersionInfo(object):
"""Defer to the openstack.common.setup routines for making a
version from git."""
if self.pre_version is None:
- return setup.get_post_version(self.python_package)
+ return setup.get_post_version(self.package)
else:
- return setup.get_pre_version(self.python_package, self.pre_version)
+ return setup.get_pre_version(self.package, self.pre_version)
def _newer_version(self, pending_version):
"""Check to see if we're working with a stale version or not.