From a80733595c5c67f95ae7c340f5a6b989f91e22ba Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sat, 10 Oct 2015 02:44:07 +0200 Subject: reproducible: finally teach the computer French (work in progress) --- TODO | 1 - bin/reproducible_build.sh | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/TODO b/TODO index 932d03e1..7633736d 100644 --- a/TODO +++ b/TODO @@ -128,7 +128,6 @@ properties: * make reproducible_build.sh rock solid again: ** fix: "DIFFOSCOPE='E: Failed to change to directory /tmp: Permission denied' - maybe by making sure the cause is gone… https://jenkins.debian.net/job/reproducible_builder_amd64_14/909/ is an example for that ** fix disorderfs setup to *always* unmount+cleanup, this causes the full disks atm -** when we search for NEEDLES ("No space left on device") we only grep for English strings, while the 2nd build happens in French… ** diffoscope needs to be run on the target arch..., this should probably be doable with qemu-static on the host ** open questions: *** save build-host in build_duration table too? (and change to saving the time of a single build, not both combined) diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 15f0ab4a..9493089c 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -473,7 +473,9 @@ download_source() { # the build master only needs to the the .dsc file schroot --directory $TMPDIR -c source:jenkins-reproducible-$SUITE apt-get -- --download-only --only-source --print-uris source ${SRCPACKAGE} | grep \.dsc|cut -d " " -f1|xargs -r wget --timeout=180 --tries=3 2>&1 | tee ${TMPLOG} fi - PARSED_RESULT=$(egrep 'E: (Unable to find a source package for|Failed to fetch.*(Unable to connect to|Connection failed|Size mismatch|Cannot initiate the connection to|Bad Gateway))' ${TMPLOG}) + local ENGLISH_RESULT=$(egrep 'E: (Unable to find a source package for|Failed to fetch.*(Unable to connect to|Connection failed|Size mismatch|Cannot initiate the connection to|Bad Gateway))' ${TMPLOG}) + local FRENCH_RESULT=$(egrep 'E: (Unable to find a source package for|impossible de récupérer.*(Unable to connect to|Échec de la connexion|Size mismatch|Cannot initiate the connection to|Bad Gateway))' ${TMPLOG}) # FIXME: please help replace the English strings with the French ones + PARSED_RESULT="${ENGLISH_RESULT}${FRENCH_RESULT}" cat ${TMPLOG} >> ${RBUILDLOG} rm ${TMPLOG} set -e -- cgit v1.2.3-70-g09d2