diff options
| author | Mattia Rizzolo <mattia@mapreri.org> | 2015-04-06 17:16:19 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-04-18 17:20:09 +0200 |
| commit | a51c8ceb659ab2225a8fdd76197358337363b12d (patch) | |
| tree | 64a9b10f02c836e298011ba1a877627d123500ae | |
| parent | 97e0cc9037d455531e1f6df52e97048aa52055b9 (diff) | |
| download | jenkins.debian.net-a51c8ceb659ab2225a8fdd76197358337363b12d.tar.xz | |
reproducible: build: refactor: make global, and move the call_debbindiff call to the main script, out of build_rebuild(). way clearer now
| -rwxr-xr-x | bin/reproducible_build.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 72b143a6..32f48596 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -294,7 +294,7 @@ check_suitability() { } build_rebuild() { - local FTBFS=1 + FTBFS=1 local TMPLOG=$(mktemp --tmpdir=$PWD) local RBUILDLOG=$(mktemp --tmpdir=$PWD) # FIXME check wheter my changes here are fine local TMPCFG=$(mktemp -t pbuilderrc_XXXX --tmpdir=$PWD) @@ -340,12 +340,11 @@ build_rebuild() { set +x if [ -f b2/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes ] ; then # both builds were fine, i.e., they did not FTBFS. - local FTBFS=0 + FTBFS=0 cleanup_userContent # FIXME check wheter my changes here are fine mv $RBUILDLOG /var/lib/jenkins/userContent/rbuild/${SUITE}/${ARCH}/${SRCPACKAGE}_${EVERSION}.rbuild.log RBUIlDLOG=/var/lib/jenkins/userContent/rbuild/${SUITE}/${ARCH}/${SRCPACKAGE}_${EVERSION}.rbuild.log cat b1/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes | tee -a ${RBUILDLOG} - call_debbindiff else echo "The second build failed, even though the first build was successful." | tee -a ${RBUILDLOG} fi @@ -382,7 +381,10 @@ EVERSION=$(echo $VERSION | cut -d ":" -f2) # EPOCH_FREE_VERSION was too long cat ${SRCPACKAGE}_${EVERSION}.dsc | tee -a ${RBUILDLOG} check_suitability -build_rebuild # defines RBUILDLOG +build_rebuild # defines FTBFS, RBUILDLOG +if [ $FTBFS -eq 0 ] ; then + call_debbindiff +fi cd .. cleanup_all |