[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible Debian: correct pathes when signing .buildinfo files

[Holger Levsen]

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

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 76ed178c07ef5ed7f430abb91a61f58730308510
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Nov 1 13:33:18 2016 +0100

    reproducible Debian: correct pathes when signing .buildinfo files
---
 bin/reproducible_build.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 9fd1299..e162a5e 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -774,9 +774,10 @@ check_buildinfo() {
 }
 
 sign_buildinfo() {
-	log_info "Signing $BUILDINFO as $BUILDINFO_SIGNED"
-	gpg --output=$BUILDINFO_SIGNED --clearsign $BUILDINFO || log_error "Could not sign $BUILDINFO"
-	log_info "Signed $BUILDINFO as $BUILDINFO_SIGNED"
+	local $BUILDPATH = "./$1"
+	log_info "Signing $BUILDPATH/$BUILDINFO as $BUILDINFO_SIGNED"
+	gpg --output=$BUILDPATH/$BUILDINFO_SIGNED --clearsign $BUILDPATH/$BUILDINFO || log_error "Could not sign $PWD/$BUILDPATH/$BUILDINFO"
+	log_info "Signed $BUILDPATH/$BUILDINFO as $BUILDPATH/$BUILDINFO_SIGNED"
 }
 
 share_buildinfo() {
@@ -857,7 +858,7 @@ elif [ "$1" = "1" ] || [ "$1" = "2" ] ; then
 	else
 		second_build
 	fi
-	sign_buildinfo
+	sign_buildinfo "b$MODE"
 	echo "$(date -u) - build #$MODE for $SRCPACKAGE/$SUITE/$ARCH on $HOSTNAME done."
 	exit 0
 elif [ "$2" != "" ] ; then

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git