[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: refactor, so that $EVERSION is always defined when building

[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 a095949450fff922e84377d19a14d3fac4062316
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Aug 30 21:34:59 2015 +0200

    reproducible: refactor, so that $EVERSION is always defined when building
---
 bin/reproducible_build.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 107f3fa..3f01912 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -410,6 +410,11 @@ get_source_package() {
 			exit 404	# FIXME: this is unhandled atm
 		fi
 	fi
+	VERSION="$(grep '^Version: ' ${SRCPACKAGE}_*.dsc| head -1 | egrep -v '(GnuPG v|GnuPG/MacGPG2)' | cut -d ' ' -f2-)"
+	EVERSION="$(echo $VERSION | cut -d ':' -f2)"  # EPOCH_FREE_VERSION was too long
+	DBDREPORT="${SRCPACKAGE}_${EVERSION}.debbindiff.html"
+	DBDTXT="${SRCPACKAGE}_${EVERSION}.debbindiff.txt"
+	BUILDINFO="${SRCPACKAGE}_${EVERSION}_${ARCH}.buildinfo"
 }
 
 check_suitability() {
@@ -607,12 +612,6 @@ LOCKFILE="/tmp/reproducible-lockfile-${SUITE}-${ARCH}-${SRCPACKAGE}"
 init
 get_source_package
 
-VERSION="$(grep '^Version: ' ${SRCPACKAGE}_*.dsc| head -1 | egrep -v '(GnuPG v|GnuPG/MacGPG2)' | cut -d ' ' -f2-)"
-EVERSION="$(echo $VERSION | cut -d ':' -f2)"  # EPOCH_FREE_VERSION was too long
-DBDREPORT="${SRCPACKAGE}_${EVERSION}.debbindiff.html"
-DBDTXT="${SRCPACKAGE}_${EVERSION}.debbindiff.txt"
-BUILDINFO="${SRCPACKAGE}_${EVERSION}_${ARCH}.buildinfo"
-
 cat ${SRCPACKAGE}_${EVERSION}.dsc | tee -a ${RBUILDLOG}
 
 check_for_race_conditions

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