diff options
| author | Kamal Mostafa <kamal@whence.com> | 2014-08-19 17:14:47 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2014-08-19 17:15:54 +0200 |
| commit | 6823e519deaf2a37a3d6225cd0392954c423b569 (patch) | |
| tree | 1e23240dfd9278f7c169a3eaeb1c3f3e9736292c /gbp | |
| parent | c3258c19c6cfa291c8bebac1dae230f6e3ccca36 (diff) | |
buildpackage: Make debian-tag message configurable
New config option --git-debian-tag-msg allows for the specification of
the message format string for signed debian-tags.
When left unset, the default debian-tag-msg format is still:
%(pkg)s Debian release %(version)s
Signed-off-by: Kamal Mostafa <kamal@whence.com>
Diffstat (limited to 'gbp')
| -rw-r--r-- | gbp/config.py | 4 | ||||
| -rwxr-xr-x | gbp/scripts/buildpackage.py | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/gbp/config.py b/gbp/config.py index af21fb8a..e0cd779a 100644 --- a/gbp/config.py +++ b/gbp/config.py @@ -106,6 +106,7 @@ class GbpOptionParser(OptionParser): 'postimport' : '', 'hooks' : 'True', 'debian-tag' : 'debian/%(version)s', + 'debian-tag-msg' : '%(pkg)s Debian release %(version)s', 'upstream-tag' : 'upstream/%(version)s', 'import-msg' : 'Imported Upstream version %(version)s', 'commit-msg' : 'Update changelog for %(version)s release', @@ -167,6 +168,9 @@ class GbpOptionParser(OptionParser): 'debian-tag': ("Format string for debian tags, " "default is '%(debian-tag)s'"), + 'debian-tag-msg': + ("Format string for signed debian-tag messages, " + "default is '%(debian-tag-msg)s'"), 'upstream-tag': ("Format string for upstream tags, " "default is '%(upstream-tag)s'"), diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py index 457673c9..86cf2703 100755 --- a/gbp/scripts/buildpackage.py +++ b/gbp/scripts/buildpackage.py @@ -402,6 +402,7 @@ def build_parser(name, prefix=None): tag_group.add_boolean_config_file_option(option_name="sign-tags", dest="sign_tags") tag_group.add_config_file_option(option_name="keyid", dest="keyid") tag_group.add_config_file_option(option_name="debian-tag", dest="debian_tag") + tag_group.add_config_file_option(option_name="debian-tag-msg", dest="debian_tag_msg") tag_group.add_config_file_option(option_name="upstream-tag", dest="upstream_tag") orig_group.add_config_file_option(option_name="upstream-tree", dest="upstream_tree") orig_group.add_boolean_config_file_option(option_name="pristine-tar", dest="pristine_tar") @@ -602,9 +603,11 @@ def main(argv): gbp.log.info("Tagging %s as %s" % (source.changelog.version, tag)) if options.retag and repo.has_tag(tag): repo.delete_tag(tag) + tag_msg=options.debian_tag_msg % dict( + pkg=source.sourcepkg, + version=source.changelog.version) repo.create_tag(name=tag, - msg="%s Debian release %s" % (source.sourcepkg, - source.changelog.version), + msg=tag_msg, sign=options.sign_tags, keyid=options.keyid) if options.posttag: sha = repo.rev_parse("%s^{}" % tag) |