From: Markus Lehtonen Date: Fri, 15 Jun 2012 06:00:35 +0000 (+0300) Subject: import-orig: move repacked_tarball_name() out from common X-Git-Tag: debian/0.6.26~73 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d0323a07cd9a54058815f73b3e7f9107c74b47fb;p=tools%2Fgit-buildpackage.git import-orig: move repacked_tarball_name() out from common Moves repacked_tarball_name() from scripts/common back to the Debian-specific script. The logic is too Debian-specific for RPM, after all. Signed-off-by: Markus Lehtonen Conflicts: gbp/scripts/common/import_orig.py gbp/scripts/import_orig.py --- diff --git a/gbp/scripts/import_orig.py b/gbp/scripts/import_orig.py index 4cf96619..f31126af 100644 --- a/gbp/scripts/import_orig.py +++ b/gbp/scripts/import_orig.py @@ -318,7 +318,8 @@ def main(argv): if orig_needs_repack(source, options): gbp.log.debug("Filter pristine-tar: repacking '%s' from '%s'" % (source.path, source.unpacked)) repack_dir = tempfile.mkdtemp(prefix='repack', dir=tmpdir) - source = repack_source(source, sourcepackage, version, repack_dir, options.filters) + repack_name = repacked_tarball_name(source, sourcepackage, version) + source = repack_source(source, repack_name, repack_dir, options.filters) (pristine_orig, linked) = prepare_pristine_tar(source.path, sourcepackage,