[Reproducible-commits] [misc] 01/02: prebuilder: Use --buildresult instead of moving files manually

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch master
in repository misc.

commit d0d260d9ebfdb6328de27eaefb7518bd6729e26a
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Tue Feb 10 03:26:15 2015 +0100

    prebuilder: Use --buildresult instead of moving files manually
---
 prebuilder/rebuild.sh | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/prebuilder/rebuild.sh b/prebuilder/rebuild.sh
index c0af645..ca762bf 100755
--- a/prebuilder/rebuild.sh
+++ b/prebuilder/rebuild.sh
@@ -29,10 +29,8 @@ PACKAGE="$1"
 rm -r b1 b2
 mkdir -p b1 b2 logs
 
-SUDO_ENV="DEB_BUILD_OPTIONS=nocheck" sudo_pbuilder --build --debbuildopts '-b' --logfile logs/${PACKAGE}.build1 ${PACKAGE}_*.dsc
+SUDO_ENV="DEB_BUILD_OPTIONS=nocheck" sudo_pbuilder --build --debbuildopts '-b' --buildresult b1 --logfile logs/${PACKAGE}.build1 ${PACKAGE}_*.dsc
 xz < logs/${PACKAGE}.build1 > logs/${PACKAGE}.build1.xz
-dcmd cp /var/cache/pbuilder/result/${PACKAGE}_*.changes b1
-sudo dcmd rm /var/cache/pbuilder/result/${PACKAGE}_*.changes
 
 # Let's make a tarball of the build result. This allows us
 # to give it to the second run of pbuilder. The configured
@@ -45,10 +43,8 @@ TMPTAR="$TMPDIR/initial_build.tar"
 
 (cd b1 && tar -cf "$TMPTAR" $(dcmd ${PACKAGE}_*.changes))
 
-SUDO_ENV="DEB_BUILD_OPTIONS=nocheck" sudo_pbuilder --build --debbuildopts '-b' --logfile logs/${PACKAGE}.build2 --hookdir "$SCRIPT_DIR/pbuilderhooks" --inputfile "$TMPTAR" ${PACKAGE}_*.dsc
+SUDO_ENV="DEB_BUILD_OPTIONS=nocheck" sudo_pbuilder --build --debbuildopts '-b' --buildresult b2 --logfile logs/${PACKAGE}.build2 --hookdir "$SCRIPT_DIR/pbuilderhooks" --inputfile "$TMPTAR" ${PACKAGE}_*.dsc
 xz < logs/${PACKAGE}.build2 > logs/${PACKAGE}.build2.xz
-dcmd cp /var/cache/pbuilder/result/${PACKAGE}_*.changes b2
-sudo dcmd rm /var/cache/pbuilder/result/${PACKAGE}_*.changes
 
 if [ -f /var/cache/pbuilder/result/debbindiff.html ]; then
 	cp /var/cache/pbuilder/result/debbindiff.html logs/${PACKAGE}.debbindiff.html

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/misc.git