diff options
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): |