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/version.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/version.py')
| -rw-r--r-- | openstack/common/version.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/openstack/common/version.py b/openstack/common/version.py index 1a15645..9c9962a 100644 --- a/openstack/common/version.py +++ b/openstack/common/version.py @@ -49,11 +49,11 @@ class VersionInfo(object): provider = pkg_resources.get_provider(requirement) return provider.version except pkg_resources.DistributionNotFound: - # The most likely cause for this is running tests in a tree with + # The most likely cause for this is running tests in a tree # produced from a tarball where the package itself has not been - # installed into anything. Check for a PKG-INFO file. + # installed into anything. Revert to setup-time logic. from openstack.common import setup - return setup.get_version_from_pkg_info(self.package) + return setup.get_version(self.package) def release_string(self): """Return the full version of the package including suffixes indicating |