Revert "Determine build_dir upfront"

This reverts commit b2549fac19f2d666552291a4fcf2020ca0570834.

diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py
index af3cd15..54e66bd 100755 (executable)
--- 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,