diff options
author | Guido Günther <agx@sigxcpu.org> | 2017-09-14 14:35:39 +0200 |
---|---|---|
committer | Guido Günther <agx@sigxcpu.org> | 2017-09-14 18:32:12 +0200 |
commit | db5c6700943706aa5f68e67769144b3a1efca8c5 (patch) | |
tree | 0bd3e8003718bcf192e09e1dd4d13b184f0f7aaa /gbp/scripts/buildpackage.py | |
parent | 23b334c511e80a7f9dc30e1b54993a62966fe138 (diff) |
Add tag command
by splitting out the code from buildpackage
This is shorter than running
gbp buildpackage --git-tag-only
Closes: #797086
Diffstat (limited to 'gbp/scripts/buildpackage.py')
-rwxr-xr-x | gbp/scripts/buildpackage.py | 42 |
1 files changed, 3 insertions, 39 deletions
diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py index 356fcccf..7ffb5e95 100755 --- a/gbp/scripts/buildpackage.py +++ b/gbp/scripts/buildpackage.py @@ -31,11 +31,9 @@ from gbp.config import (GbpOptionParserDebian, GbpOptionGroup) from gbp.deb.git import (GitRepositoryError, DebianGitRepository) from gbp.deb.source import DebianSource, DebianSourceError, FileVfs from gbp.deb.format import DebianSourceFormat -from gbp.format import format_str from gbp.git.vfs import GitVfs from gbp.deb.upstreamsource import DebianUpstreamSource from gbp.errors import GbpError -from gbp.scripts.common.pq import is_pq_branch, pq_branch_base import gbp.log import gbp.notifications from gbp.scripts.common.buildpackage import (index_name, wc_name, @@ -45,6 +43,7 @@ from gbp.scripts.common import ExitCodes from gbp.scripts.common.hook import Hook from gbp.scripts.export_orig import prepare_upstream_tarballs +from gbp.scripts.tag import perform_tagging def pristine_tar_commit(repo, source, options, output_dir, orig_file, upstream_tree): @@ -196,27 +195,6 @@ def check_tag(options, repo, source): raise GbpError("Tag '%s' already exists" % tag) -def create_debian_tag(repo, source, commit, options): - """ - Create the debian tag - - returns: the created tag - """ - tag = repo.version_to_tag(options.debian_tag, source.version) - gbp.log.info("Tagging %s as %s" % (source.version, tag)) - if options.retag and repo.has_tag(tag): - repo.delete_tag(tag) - tag_msg = format_str(options.debian_tag_msg, - dict(pkg=source.sourcepkg, - version=source.version)) - repo.create_tag(name=tag, - msg=tag_msg, - sign=options.sign_tags, - commit=commit, - keyid=options.keyid) - return tag - - def get_pbuilder_dist(options, repo, native=False): """ Determin the dist to build for with pbuilder/cowbuilder @@ -487,7 +465,6 @@ def main(argv): retval = 0 prefix = "git-" source = None - branch = None hook_env = {} options, gbp_args, dpkg_args = parse_args(argv, prefix) @@ -503,8 +480,7 @@ def main(argv): try: clean_working_tree(options, repo) - branch = check_branch(repo, options) - head = repo.head + check_branch(repo, options) tree = maybe_write_tree(repo, options) source = source_vfs(repo, options, tree) @@ -575,20 +551,8 @@ def main(argv): 'GBP_BUILD_DIR': build_dir}) )() if options.tag or options.tag_only: - if branch and is_pq_branch(branch): - commit = repo.get_merge_base(branch, pq_branch_base(branch)) - else: - commit = head + perform_tagging(repo, source, options, hook_env) - tag = create_debian_tag(repo, source, commit, options) - if options.posttag: - sha = repo.rev_parse("%s^{}" % tag) - Hook('Posttag', options.posttag, - extra_env=Hook.md(hook_env, - {'GBP_TAG': tag, - 'GBP_BRANCH': branch or '(no branch)', - 'GBP_SHA1': sha}) - )() except KeyboardInterrupt: retval = 1 gbp.log.err("Interrupted. Aborting.") |