From 7cc19c1d1816b1831ac0d7a01535abd4dd894066 Mon Sep 17 00:00:00 2001 From: Guido Guenther Date: Thu, 21 Feb 2008 16:23:23 +0100 Subject: add pristine-tar support based on a patch from Julian Andres Klode (Closes: #463580) --- git-import-dsc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'git-import-dsc') diff --git a/git-import-dsc b/git-import-dsc index 37de62d..cafa792 100755 --- a/git-import-dsc +++ b/git-import-dsc @@ -106,8 +106,13 @@ def import_initial(src, dirs, options, tagger, filter): format = [options.upstream_tag, options.debian_tag][src.native] tagger(build_tag(format, src.upstream_version), msg="Upstream version %s" % src.upstream_version) + if not src.native: gbpc.GitBranch()(options.upstream_branch) + if options.pristine_tar: + gbpc.PristineTar().commit(os.path.join(dirs['top'], src.tgz), + options.upstream_branch) + except gbpc.CommandExecFailed: print >>sys.stderr, "Creation of git repository failed" gbpc.RemoveTree(unpackTGZ.dir)() @@ -189,6 +194,8 @@ def main(argv): help="Format string for upstream tags, default is '%(upstream-tag)s'") parser.add_config_file_option(option_name="filter", dest="filter", help="files to filter out during import") + parser.add_config_file_option(option_name="pristine-tar", dest="pristine_tar", + help="Use pristine-tar to import the tarball", action="store_true") (options, args) = parser.parse_args(argv[1:]) if options.verbose: @@ -200,7 +207,7 @@ def main(argv): if len(args) != 1: parser.print_help() raise GbpError - else: + else: src = parse_dsc(args[0]) if not src: raise GbpError @@ -208,6 +215,7 @@ def main(argv): dirs['tmp'] = os.path.abspath(tempfile.mkdtemp(dir='.')) if not import_initial(src, dirs, options, gitTag, options.filter): raise GbpError + os.chdir(dirs['top']) if not src.native: dirs['unpack'] = os.path.join(dirs['tmp'], 'unpack') -- cgit v1.2.3