diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-07-12 04:45:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-07-12 04:45:44 +0000 |
| commit | 313866f845dce197fe53288f3bcf400ebbcf3c9b (patch) | |
| tree | e134b0406ba506678bec7dee344150aaa2e79942 | |
| parent | fb3ff01ecd97823e76ee0948db2fa3a6d9cf1f8f (diff) | |
| parent | 137bdc5bdf2803541e50a09fc27fddf720ce79a3 (diff) | |
| download | pbr-313866f845dce197fe53288f3bcf400ebbcf3c9b.tar.gz | |
Merge "Support version override with PBR prefix." into feature/merged2to1
| -rw-r--r-- | pbr/packaging.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pbr/packaging.py b/pbr/packaging.py index bbc8d38..97f95a8 100644 --- a/pbr/packaging.py +++ b/pbr/packaging.py @@ -628,7 +628,9 @@ def get_version(package_name, pre_version=None): to make a source tarball from a fork of our repo with additional tags in it that they understand and desire the results of doing that. """ - version = os.environ.get("OSLO_PACKAGE_VERSION", None) + version = os.environ.get( + "PBR_VERSION", + os.environ.get("OSLO_PACKAGE_VERSION", None)) if version: return version version = _get_version_from_pkg_info(package_name) |