[kernel] r17622 - dists/trunk/linux-2.6/debian/bin
Ben Hutchings
benh at alioth.debian.org
Tue Jun 7 09:37:27 UTC 2011
Author: benh
Date: Tue Jun 7 09:37:25 2011
New Revision: 17622
Log:
Add genorig.py option to override git tag
This lets us work around the varying use of 2-component and
3-component versions.
Modified:
dists/trunk/linux-2.6/debian/bin/genorig.py
Modified: dists/trunk/linux-2.6/debian/bin/genorig.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/genorig.py Tue Jun 7 09:35:47 2011 (r17621)
+++ dists/trunk/linux-2.6/debian/bin/genorig.py Tue Jun 7 09:37:25 2011 (r17622)
@@ -13,7 +13,7 @@
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 @@
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 @@
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)()
More information about the Kernel-svn-changes
mailing list