Skip to content

Fix an issue when both export-dir and tarball-dir is set #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix an issue when both export-dir and tarball-dir is set #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f0b8c4
Add test case to reproduce the issue with the --tarball-dir
mochrul Aug 29, 2020
0a0a394
Fix an issue when both export-dir and tarball-dir is set
mochrul Aug 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gbp/scripts/buildpackage.py
View file
Open in desktop
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
8 changes: 8 additions & 0 deletions tests/component/deb/test_buildpackage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,14 @@ def test_export_dir_buildpackage(self, repo):
self._test_buildpackage(repo, ['--git-export-dir=../foo/bar'])
ok_(os.path.exists('../foo/bar'))

@RepoFixtures.quilt30()
def test_export_dir_with_tarball_dir_buildpackage(self, repo):
"""Test that building with a export dir and tarball dir (without the actual tarball) works"""
self._test_buildpackage(repo, ['--git-export-dir=../foo/bar',
'--git-tarball-dir=../foo',
'--git-overlay'])
ok_(os.path.exists('../foo/bar'))

@RepoFixtures.quilt30_additional_tarball()
def test_export_dir_additional_tar(self, repo):
"""Test that building with a export dir and additional tarball works"""
Expand Down