diff options
| author | Guido Günther <agx@sigxcpu.org> | 2014-05-22 14:53:47 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2014-05-22 16:22:29 +0200 |
| commit | b2549fac19f2d666552291a4fcf2020ca0570834 (patch) | |
| tree | c0e75c5ed7d16b612c3f26e27235231d34943538 | |
| parent | 54e454209a7573b4c321fc19a39f6991a6bd1ac0 (diff) | |
Determine build_dir upfront
so it's available to all hooks
| -rwxr-xr-x | gbp/scripts/buildpackage.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py index 77a5b969..24a759e9 100755 --- a/gbp/scripts/buildpackage.py +++ b/gbp/scripts/buildpackage.py @@ -526,6 +526,7 @@ 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 @@ -565,11 +566,6 @@ 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: RunAtCommand(options.prebuild, shell=True, extra_env={'GBP_GIT_DIR': repo.git_dir, |