From 4b59a14f914e8ecea79f857e37389b2c1578d99b Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Thu, 18 Apr 2013 10:49:38 +0300 Subject: buildpackage-rpm: full sha1 in the tagname for VCS tag Use full-length sha1 in the 'tagname' that is used in the VCS tag in the spec file (cmdline option --git-spec-vcs-tag). Signed-off-by: Markus Lehtonen --- gbp/scripts/buildpackage_rpm.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gbp/scripts/buildpackage_rpm.py b/gbp/scripts/buildpackage_rpm.py index 831d85f2..f6a15197 100755 --- a/gbp/scripts/buildpackage_rpm.py +++ b/gbp/scripts/buildpackage_rpm.py @@ -603,7 +603,8 @@ def main(argv): 'GBP_SHA1': sha})() else: try: - tree_name = repo.describe(tree, longfmt=True, always=True) + tree_name = repo.describe(tree, longfmt=True, always=True, + abbrev=40) except GitRepositoryError: # If tree is not commit-ish, expect it to be from current HEAD tree_name = repo.describe('HEAD', longfmt=True, always=True) +\ -- cgit v1.2.3