[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: shorten mail content

[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 4a3a491e8f788d7b95f0b04979a02541d25bba4d
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Nov 15 01:21:51 2015 +0100

    reproducible: shorten mail content
---
 bin/reproducible_build.sh   | 2 +-
 logparse/reproducible.rules | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 08704f8..c6ae6c0 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -25,7 +25,7 @@ create_results_dirs() {
 handle_race_condition() {
 	echo | tee -a $BUILDLOG
 	local RESULT=$(sqlite3 -init $INIT ${PACKAGES_DB} "SELECT builder FROM schedule WHERE package_id='$SRCPKGID'")
-	local msg="Warning, package ${SRCPACKAGE} (id=$SRCPKGID) in ${SUITE} on ${ARCH} is probably already building at $RESULT, while this is $BUILD_URL.\n"
+	local msg="Warning, package ${SRCPACKAGE} (id=$SRCPKGID) in ${SUITE} is building at $RESULT, this is $BUILD_URL.\n"
 	printf "$msg" | tee -a $BUILDLOG
 	printf "$(date -u) - $msg" >> /var/log/jenkins/reproducible-race-conditions.log
 	echo "$(date -u) - Terminating this build quickly and nicely..." | tee -a $RBUILDLOG
diff --git a/logparse/reproducible.rules b/logparse/reproducible.rules
index 09e75ad..828f1aa 100644
--- a/logparse/reproducible.rules
+++ b/logparse/reproducible.rules
@@ -10,7 +10,6 @@ warning /Warning: processes found which should not be there/
 warning /Warning: Found files with bad permissions.+/
 warning /Warning: .+ could not be fully removed.+/
 warning /Warning: cannot update html pages for.+/
-warning /Warning: package .+is probably already building elsewhere, exiting./
 warning /Warning: too much difference for .+, aborting. Please investigate and update manually./
 warning /Warning: couldn't delete old files from.+/
 warning /Warning: failed to update the .+ schroot./

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