[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: fix typos
Holger Levsen
holger at moszumanska.debian.org
Wed Sep 23 08:29:59 UTC 2015
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 a352d25475a4407e3005cb542f0d3e039f803b46
Author: Holger Levsen <holger at layer-acht.org>
Date: Wed Sep 23 10:29:26 2015 +0200
reproducible: fix typos
---
bin/reproducible_build.sh | 8 ++++----
bin/reproducible_common.sh | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 3241461..5c2a42a 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -308,8 +308,8 @@ call_diffoscope_on_changes_files() {
local TEMP=$(mktemp --tmpdir=$TMPDIR -d dbd-tmp-XXXXXXX)
DIFFOSCOPE="$(schroot --directory $TMPDIR -c source:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1 || true)"
LOG_RESULT=$(echo $DIFFOSCOPE | grep '^E: 15binfmt: update-binfmts: unable to open' || true)
- if [ ! -z "LOG_RESULT" ] ; then
- echo "$(date -u) - schroot jenkins-reproducible-${DBDSUITE}-diffoscope not availble, will sleep 2min and retry."
+ if [ ! -z "$LOG_RESULT" ] ; then
+ echo "$(date -u) - schroot jenkins-reproducible-${DBDSUITE}-diffoscope not available, will sleep 2min and retry."
sleep 2m
DIFFOSCOPE="$(schroot --directory $TMPDIR -c source:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1 || echo 'diffoscope_version_not_available')"
fi
@@ -328,9 +328,9 @@ call_diffoscope_on_changes_files() {
2>&1 ) >> $TMPLOG
RESULT=$?
LOG_RESULT=$(grep '^E: 15binfmt: update-binfmts: unable to open' $TMPLOG || true)
- if [ ! -z "LOG_RESULT" ] ; then
+ if [ ! -z "$LOG_RESULT" ] ; then
rm -f $TMPLOG $TMPDIR/${DBDREPORT} $TMPDIR/$DBDTXT
- echo "$(date -u) - schroot jenkins-reproducible-${DBDSUITE}-diffoscope not availble, will sleep 2min and retry."
+ echo "$(date -u) - schroot jenkins-reproducible-${DBDSUITE}-diffoscope not available, will sleep 2min and retry."
sleep 2m
# remember to also modify the retry diffoscope call 15 lines above
( timeout $TIMEOUT schroot \
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 0e8d122..ec7a62b 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -447,9 +447,9 @@ call_diffoscope() {
) 2>&1 >> $TMPLOG
RESULT=$?
LOG_RESULT=$(grep '^E: 15binfmt: update-binfmts: unable to open' $TMPLOG || true)
- if [ ! -z "LOG_RESULT" ] ; then
+ if [ ! -z "$LOG_RESULT" ] ; then
rm -f $TMPLOG $TMPDIR/$1/$2.html
- echo "$(date -u) - schroot jenkins-reproducible-${DBDSUITE}-diffoscope not availble, will sleep 2min and retry."
+ echo "$(date -u) - schroot jenkins-reproducible-${DBDSUITE}-diffoscope not available, will sleep 2min and retry."
sleep 2m
# remember to also modify the retry diffoscope call 15 lines above
( timeout $TIMEOUT schroot \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git
More information about the Qa-jenkins-scm
mailing list