Skip to content

Commit

Permalink
Fix an issue when both export-dir and tarball-dir is set
Browse files Browse the repository at this point in the history
When the export-dir is set, the git tree is archived and then re-extracted
into the new place.  Unfortunately, different directory is in use to create
the archive (output_dir) and then to extract it (tarball_dir, controlled by
the tarball-dir option).  This means that if no orig.tar.gz is provided in
the tarball_dir directory, the extraction will fail.
  • Loading branch information
mochrul committed Aug 29, 2020
1 parent 3f0b8c4 commit 0a0a394
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion gbp/scripts/buildpackage.py
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ def main(argv):

# Export to another build dir if requested:
if options.export_dir:
export_source(repo, tree, source, options, tmp_dir, tarball_dir)
export_source(repo, tree, source, options, tmp_dir, output_dir)

# Run postexport hook
if options.postexport:
Expand Down

0 comments on commit 0a0a394

Please sign in to comment.