summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-08-30 21:34:59 +0200
committerHolger Levsen <holger@layer-acht.org>2015-08-30 21:34:59 +0200
commita095949450fff922e84377d19a14d3fac4062316 (patch)
tree5e74668e703f9557eba95217331016f4e3a3ecf1
parent603becb6b6c3f956a2d437c1c553fce928ac4c53 (diff)
downloadjenkins.debian.net-a095949450fff922e84377d19a14d3fac4062316.tar.xz
reproducible: refactor, so that $EVERSION is always defined when building
-rwxr-xr-xbin/reproducible_build.sh11
1 files changed, 5 insertions, 6 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 107f3fa7..3f01912f 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