[Qa-jenkins-scm] [jenkins.debian.net] 01/02: reproducible notes.git committer count: remove clever pipe (which didnt work) and use the same grep command twice

[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 fc09aad8fcb2563c9cdddc86d06282fdef3c3bed
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat May 14 00:51:39 2016 +0200

    reproducible notes.git committer count: remove clever pipe (which didnt work) and use the same grep command twice
---
 bin/reproducible_html_dashboard.sh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/bin/reproducible_html_dashboard.sh b/bin/reproducible_html_dashboard.sh
index 0e03d36..6a7b01e 100755
--- a/bin/reproducible_html_dashboard.sh
+++ b/bin/reproducible_html_dashboard.sh
@@ -501,12 +501,16 @@ create_dashboard_page() {
 	write_page "$TD_PKG_SID</tr>"
 	write_page "$TD_PKG_TESTING</tr>"
 
-	# this IGNOREPIPE needs to be manually maintained indeed… 
-	# for the last 3 months we live with errors…
-	IGNOREPIPE="grep -v alexis at passoire.fr | grep -v christoph.berg at credativ.de | grep -v d.s at daniel.shahaf.name | grep -v dhole at openmailbox.com | grep -v jelmer at jelmer.uk | grep -v mattia at mapreri.org | grep -v micha at lenk.info | grep -v mail at sandroknauss.de | grep -v sanvila at unex.es"
+	# in the following two write_page() calls we use the same
+	# insane grep to filter people who committed with several
+	# usernames…
 	if [ -f ${NOTES_GIT_PATH}/packages.yml ] && [ -f ${NOTES_GIT_PATH}/issues.yml ] ; then
-		write_page "<tr><td>committers to <a href=\"https://anonscm.debian.org/git/reproducible/notes.git\" target=\"_parent\">notes.git</a> (in the last three months)</td><td>$(cd ${NOTES_GIT_PATH} ; git log --since="3 months ago"|grep Author|sort -u |wc -l)</td><td colspan=\"$AC\"></td></tr>"
-		write_page "<tr><td>committers to notes.git (in total)</td><td>$(cd ${NOTES_GIT_PATH} ; git log |grep Author|sort -u |$IGNOREPIPE|wc -l)</td><td colspan=\"$AC\"></td></tr>"
+		write_page "<tr><td>committers to <a href=\"https://anonscm.debian.org/git/reproducible/notes.git\" target=\"_parent\">notes.git</a> (in the last three months)</td><td>$(cd ${NOTES_GIT_PATH} ; git log --since="3 months ago"|grep Author|sort -u | \
+				grep -v alexis at passoire.fr | grep -v christoph.berg at credativ.de | grep -v d.s at daniel.shahaf.name | grep -v dhole at openmailbox.com | grep -v jelmer at jelmer.uk | grep -v mattia at mapreri.org | grep -v micha at lenk.info | grep -v mail at sandroknauss.de | grep -v sanvila at unex.es | \
+				wc -l)</td><td colspan=\"$AC\"></td></tr>"
+		write_page "<tr><td>committers to notes.git (in total)</td><td>$(cd ${NOTES_GIT_PATH} ; git log |grep Author|sort -u | \
+				grep -v alexis at passoire.fr | grep -v christoph.berg at credativ.de | grep -v d.s at daniel.shahaf.name | grep -v dhole at openmailbox.com | grep -v jelmer at jelmer.uk | grep -v mattia at mapreri.org | grep -v micha at lenk.info | grep -v mail at sandroknauss.de | grep -v sanvila at unex.es | \
+				wc -l)</td><td colspan=\"$AC\"></td></tr>"
 	fi
 	RESULT=$(cat /srv/reproducible-results/modified_in_sid.txt || echo "unknown")	# written by reproducible_html_repository_comparison.sh
 	write_page "<tr><td>packages <a href=\"/index_repositories.html\">modified in our toolchain</a> (in unstable)</td><td>$(echo $RESULT)</td><td colspan=\"$AC\"></td></tr>"

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