diff options
| author | Robert Collins <rbtcollins@hp.com> | 2015-04-30 09:47:22 +1200 |
|---|---|---|
| committer | Robert Collins <rbtcollins@hp.com> | 2015-04-30 11:26:00 +1200 |
| commit | a67e2c346c5193cf36e381694d8fddb0d826df6b (patch) | |
| tree | d3a5cb0ac1c8993153ddf994361586d8dba15e0e /pbr/packaging.py | |
| parent | 0971d6f63adf19eea45791d34619d27a0ba73553 (diff) | |
| download | pbr-a67e2c346c5193cf36e381694d8fddb0d826df6b.tar.gz | |
Issue #1450210: Preversioning rc tag handling0.11.0
We were generating versions lower than the last tag when preversioning
was in use and pre-release versions had been tagged.
Also attempt to run the script without devstack.
Change-Id: If984939003ae7c513ee76b52c6808db0c1766050
Closes-Bug: #1450210
Diffstat (limited to 'pbr/packaging.py')
| -rw-r--r-- | pbr/packaging.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pbr/packaging.py b/pbr/packaging.py index e266d4f..9ed1dbb 100644 --- a/pbr/packaging.py +++ b/pbr/packaging.py @@ -555,10 +555,12 @@ def _get_version_from_git_target(git_dir, target_version): dict(new=new_version, target=target_version)) if distance == 0: return last_semver + new_dev = new_version.to_dev(distance) if target_version is not None: - return target_version.to_dev(distance) - else: - return new_version.to_dev(distance) + target_dev = target_version.to_dev(distance) + if target_dev > new_dev: + return target_dev + return new_dev def _get_version_from_git(pre_version=None): |