From 5cde49a3cc2fac3d1f93fbdebbaa81ea9e4e2b4c Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Sat, 24 May 2014 18:40:35 +0200 Subject: Revert "Determine build_dir upfront" This reverts commit b2549fac19f2d666552291a4fcf2020ca0570834. --- gbp/scripts/buildpackage.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py index af3cd152..54e66bd2 100755 --- a/gbp/scripts/buildpackage.py +++ b/gbp/scripts/buildpackage.py @@ -533,7 +533,6 @@ def main(argv): tree = write_tree(repo, options) source = source_vfs(repo, options, tree) - build_dir = export_dir if options.export_dir else repo_dir if not options.tag_only: output_dir = prepare_output_dir(options.export_dir) tarball_dir = options.tarball_dir or output_dir @@ -573,6 +572,11 @@ def main(argv): prepare_upstream_tarball(repo, source.changelog, options, tarball_dir, output_dir) + if options.export_dir: + build_dir = export_dir + else: + build_dir = repo_dir + if options.prebuild: Hook('Prebuild', options.prebuild, shell=True, extra_env={'GBP_GIT_DIR': repo.git_dir, -- cgit v1.2.3