release-engineering/tito
1
0
Fork 0
mirror of https://github.com/rpm-software-management/tito.git synced 2025-02-23 20:22:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't use a special tagger for the --use-version case

Browse source 
Instead of special-casing the case where a user has supplied
the specific version to use, we can instead use the same version
tagger for both cases and detect inside of that tagger whether
or not the user has supplied the tag.

Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
This commit is contained in:
Steve Kuznetsov 2016-10-31 10:54:37 -04:00
parent de3e7b62a2
commit 26b02a7ff4
No known key found for this signature in database
GPG key ID: 366E054B30FC03A2
1 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/tito/tagger/main.py
View file

@ -371,7 +371,7 @@ class VersionTagger(ConfigObject):
mvn_new_version))
run_command("git add %s" % pom_file)
def _bump_version(self, release=False, zstream=False, force=False):
def _bump_version(self, release=False, zstream=False):
"""
Bump up the package version in the spec file.
@ -405,7 +405,7 @@ class VersionTagger(ConfigObject):
increase_zstream(match.group(2)),
"\n"
))
elif force:
elif hasattr(self, '_use_version'):
match = re.match(version_regex, line)
if match:
line = "".join((match.group(1),
@ -656,19 +656,9 @@ class ReleaseTagger(VersionTagger):
class ForceVersionTagger(VersionTagger):
"""
Tagger which forcibly updates the spec file to a version provided on the
command line by the --use-version option.
TODO: could this be merged into main taggers?
Legacy Tagger which is chosen when a user passes the `--use-version`
flag in on the command line. This implementation has been merged with
the default `VersionTagger`, and remains only for backward compatibility
for users that were overriding this class with a custom implementation.
TODO: remove this class in a future release
"""
def _tag_release(self):
"""
Tag a new release of the package.
"""
self._make_changelog()
new_version = self._bump_version(force=True)
self._check_tag_does_not_exist(self._get_new_tag(new_version))
self._update_changelog(new_version)
self._update_setup_py(new_version)
self._update_pom_xml(new_version)
self._update_package_metadata(new_version)