return name
-def repack_source(source, name, version, tmpdir, filters):
+def repack_source(source, name, version, unpack_dir, filters):
"""Repack the source tree"""
name = repacked_tarball_name(source, name, version)
repacked = source.pack(name, filters)
if source.is_orig(): # the tarball was filtered on unpack
repacked.unpacked = source.unpacked
else: # otherwise unpack the generated tarball get a filtered tree
- if tmpdir:
- cleanup_tmp_tree(tmpdir)
- tmpdir = tempfile.mkdtemp(dir='../')
- repacked.unpack(tmpdir, filters)
- return (repacked, tmpdir)
+ repacked.unpack(unpack_dir, filters)
+ return repacked
def main(argv):
ret = 0
- tmpdir = ''
+ tmpdir = tempfile.mkdtemp(dir='../')
pristine_orig = None
linked = False
set_bare_repo_options(options)
if not source.is_dir():
- tmpdir = tempfile.mkdtemp(dir='../')
- source.unpack(tmpdir, options.filters)
+ unpack_dir = tempfile.mkdtemp(prefix='unpack', dir=tmpdir)
+ source.unpack(unpack_dir, options.filters)
gbp.log.debug("Unpacked '%s' to '%s'" % (source.path, source.unpacked))
if orig_needs_repack(source, options):
gbp.log.debug("Filter pristine-tar: repacking '%s' from '%s'" % (source.path, source.unpacked))
- (source, tmpdir) = repack_source(source, sourcepackage, version, tmpdir, options.filters)
+ repack_dir = tempfile.mkdtemp(prefix='repack', dir=tmpdir)
+ source = repack_source(source, sourcepackage, version, repack_dir, options.filters)
(pristine_orig, linked) = prepare_pristine_tar(source.path,
sourcepackage,