aboutsummaryrefslogtreecommitdiff
path: root/gbp/scripts/buildpackage_rpm.py
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2016-12-07 11:49:39 +0100
committerGuido Günther <agx@sigxcpu.org>2016-12-07 11:50:12 +0100
commit1d44f4863167982419dfbba4f30c712e05afa834 (patch)
treee5b7da66555c07a764580cef879cf17f34550f78 /gbp/scripts/buildpackage_rpm.py
parent6993e0af91e0b5a023b0601293bbb62bbc53b6d2 (diff)
buildpackage_rpm: drop unused vcs_info()
Diffstat (limited to 'gbp/scripts/buildpackage_rpm.py')
-rw-r--r--gbp/scripts/buildpackage_rpm.py20
1 files changed, 0 insertions, 20 deletions
diff --git a/gbp/scripts/buildpackage_rpm.py b/gbp/scripts/buildpackage_rpm.py
index 6d50977..b979d12 100644
--- a/gbp/scripts/buildpackage_rpm.py
+++ b/gbp/scripts/buildpackage_rpm.py
@@ -185,23 +185,6 @@ def get_current_branch(repo):
return branch
-def get_vcs_info(repo, treeish):
- """Get the info for spec vcs tag"""
- info = {}
- try:
- info['tagname'] = repo.describe(treeish, longfmt=True, always=True,
- abbrev=40)
- info['commit'] = repo.rev_parse('%s^0' % treeish)
- info['commitish'] = repo.rev_parse('%s' % treeish)
- except GitRepositoryError:
- # If tree is not commit-ish, expect it to be from current HEAD
- info['tagname'] = repo.describe('HEAD', longfmt=True, always=True,
- abbrev=40) + '-dirty'
- info['commit'] = repo.rev_parse('HEAD') + '-dirty'
- info['commitish'] = info['commit']
- return info
-
-
def git_archive_build_orig(repo, spec, output_dir, options):
"""
Build orig tarball using git-archive
@@ -613,15 +596,12 @@ def main(argv):
gbp.log.info("Tagging %s" % rpm.compose_version_str(spec.version))
tag = create_packaging_tag(repo, tree, spec.name, spec.version,
options)
- vcs_info = get_vcs_info(repo, tag)
if options.posttag:
sha = repo.rev_parse("%s^{}" % tag)
Command(options.posttag, shell=True,
extra_env={'GBP_TAG': tag,
'GBP_BRANCH': branch,
'GBP_SHA1': sha})()
- else:
- vcs_info = get_vcs_info(repo, tree)
except KeyboardInterrupt:
retval = 1
gbp.log.err("Interrupted. Aborting.")