diff options
| author | Guido Günther <agx@sigxcpu.org> | 2018-10-28 12:40:12 +0100 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2018-10-28 12:40:12 +0100 |
| commit | caa586a1650e18232096e530c97b5cbd7cab325e (patch) | |
| tree | 303f5151f4a6027540db9f3288264816f804714a | |
| parent | ce6b1e755fbd999156dbe8c0bf28ccb180641ba2 (diff) | |
builpackage-rpm: Use GBP_TMP_DIR instead f GBP_BUILD_DIR
This is consistent with --git-post-export and unbreaks
tests/component/rpm/test_buildpackage_rpm.py:TestGbpRpm.test_hook_options
| -rw-r--r-- | docs/manpages/gbp-buildpackage-rpm.xml | 3 | ||||
| -rw-r--r-- | gbp/scripts/buildpackage_rpm.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/docs/manpages/gbp-buildpackage-rpm.xml b/docs/manpages/gbp-buildpackage-rpm.xml index 18a0a1e1..00e838ac 100644 --- a/docs/manpages/gbp-buildpackage-rpm.xml +++ b/docs/manpages/gbp-buildpackage-rpm.xml @@ -347,7 +347,8 @@ <para> Exported environment variables are: <envar>GBP_GIT_DIR</envar> (the repository the package is being built from), - <envar>GBP_BUILD_DIR</envar> (the build dir). + <envar>GBP_TMP_DIR</envar> (the temporary directory where the sources + have been initially exported). </para> </listitem> </varlistentry> diff --git a/gbp/scripts/buildpackage_rpm.py b/gbp/scripts/buildpackage_rpm.py index 952ff247..30f27f67 100644 --- a/gbp/scripts/buildpackage_rpm.py +++ b/gbp/scripts/buildpackage_rpm.py @@ -540,7 +540,7 @@ def main(argv): if options.preexport: RunAtCommand(options.preexport, shell=True, extra_env={'GBP_GIT_DIR': repo.git_dir, - 'GBP_BUILD_DIR': export_dir} + 'GBP_TMP_DIR': export_dir} )() # Move packaging files to final export dir |