Add genorig.py option to override git tag

This lets us work around the varying use of 2-component and
3-component versions.

svn path=/dists/trunk/linux-2.6/; revision=17622
This commit is contained in:
Ben Hutchings 2011-06-07 09:37:25 +00:00
parent c896a40061
commit 3ddbbbd725
1 changed files with 4 additions and 3 deletions

View File

@ -13,7 +13,7 @@ from debian_linux.debian import Changelog, VersionLinux
from debian_linux.patches import PatchSeries
class Main(object):
def __init__(self, input_files, override_version):
def __init__(self, input_files, override_version, override_tag):
self.log = sys.stdout.write
self.input_files = input_files
@ -33,7 +33,7 @@ class Main(object):
self.orig = '%s-%s' % (source, version.upstream)
self.orig_tar = '%s_%s.orig.tar.gz' % (source, version.upstream)
self.tag = 'v' + version.upstream.replace('~', '-')
self.tag = override_tag or ('v' + version.upstream.replace('~', '-'))
def __call__(self):
import tempfile
@ -130,7 +130,8 @@ if __name__ == '__main__':
from optparse import OptionParser
parser = OptionParser(usage = "%prog [OPTION]... {TAR [PATCH] | REPO}")
parser.add_option("-V", "--override-version", dest = "override_version", help = "Override version", metavar = "VERSION")
parser.add_option("-t", "--override-tag", dest = "override_tag", help = "Override tag", metavar = "TAG")
options, args = parser.parse_args()
assert 1 <= len(args) <= 2
Main(args, options.override_version)()
Main(args, options.override_version, options.override_tag)()