From a55f642cd3e2d7e330cf96ff9f9eb5d03ae39192 Mon Sep 17 00:00:00 2001 From: Richard Ipsum Date: Wed, 15 Jul 2015 16:21:36 +0100 Subject: Don't include extension in tag if present For example, we'd rather the tag be docbook-xml-4.5 than docbook-xml-4.5.zip Change-Id: I617b1c577ff95e4231681c75d3a91f4826cafd2b --- lorry.zip-importer | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorry.zip-importer b/lorry.zip-importer index d2d5493..5524834 100755 --- a/lorry.zip-importer +++ b/lorry.zip-importer @@ -11,6 +11,7 @@ ## git log --stat import-zips from os import popen, path +from os.path import splitext from sys import argv, exit, hexversion, stderr from time import mktime from zipfile import ZipFile @@ -74,7 +75,9 @@ for zipfile in argv[1:]: fast_import.write('M 100644 ' + mark[name] + ' ' + name[len(common_prefix):] + "\n") - printlines(('', 'tag ' + path.basename(zipfile), \ + zipname, _ = splitext(zipfile_basename) + + printlines(('', 'tag ' + zipname, \ 'from ' + branch_ref, 'tagger ' + committer, \ 'data <