diff options
| author | Guido Günther <agx@sigxcpu.org> | 2009-04-05 19:03:34 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2009-04-05 19:03:49 +0200 |
| commit | 829db7cea1de6f17e6e6a4a205ccd767bc3d3ea5 (patch) | |
| tree | 834d4293e699021a420aa6c1b2263aa77e0bb131 | |
| parent | e4db34b4adf1434581c76e7c58d6927f8d50154b (diff) | |
pass GBP_BUILD_DIR to the build command
this allows hooks to figure out where to copy back the build result.
Adjust the cowbuilder example accordingly.
| -rwxr-xr-x | examples/gbp-cowbuilder-sid | 1 | ||||
| -rwxr-xr-x | git-buildpackage | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/examples/gbp-cowbuilder-sid b/examples/gbp-cowbuilder-sid index bcbf148..4021f23 100755 --- a/examples/gbp-cowbuilder-sid +++ b/examples/gbp-cowbuilder-sid @@ -30,6 +30,7 @@ case $ACTION in # pass all options to dpkg-buildpackage: pdebuild --configfile ${CONF} \ --pbuilder cowbuilder \ + --buildresult ${GBP_BUILD_DIR}/.. \ --debbuildopts "-i\.git/ -I.git $*" \ -- $OPTS ;; diff --git a/git-buildpackage b/git-buildpackage index 7362156..2e9ebdd 100755 --- a/git-buildpackage +++ b/git-buildpackage @@ -282,13 +282,15 @@ def main(argv): build_dir = repo_dir # Finally build the package: - RunAtCommand(options.builder, dpkg_args, shell=True)(dir=build_dir) + RunAtCommand(options.builder, dpkg_args, shell=True, + extra_env={'GBP_BUILD_DIR': build_dir})(dir=build_dir) if options.postbuild: arch = du.get_arch() changes = os.path.abspath("%s/../%s_%s_%s.changes" % (build_dir, cp['Source'], version_no_epoch, arch)) Command(options.postbuild, shell=True, - extra_env={'GBP_CHANGES_FILE': changes})() + extra_env={'GBP_CHANGES_FILE': changes, + 'GBP_BUILD_DIR': build_dir})() if options.tag or options.tag_only: print "Tagging %s" % version tag = build_tag(options.debian_tag, version) |