From 2133cb010c43b9664c6edd90be8c872a70cfd7ad Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Fri, 28 Feb 2020 15:34:59 +0000
Subject: [PATCH] Changed the release script to not pick up other email
 addresses than those of contributors from the release notes.  - Legacy-Id:
 17369

---
 bin/mkrelease | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/mkrelease b/bin/mkrelease
index ead03815a..cfb4368e8 100755
--- a/bin/mkrelease
+++ b/bin/mkrelease
@@ -244,7 +244,8 @@ if [ -d ../coverage ]; then
     rsync -a static/coverage/ ../coverage/$VER/
 fi
 
-contributors=$(echo "$changes" | sed 's/\.[ \t\n]/ /'| tr -c "a-z0-9.@-" "\n" | sort | uniq | grep '@' | sed -r -e 's/^\.+//' -e 's/\.+$//' -e 's/^/-c /' || true)
+contributors=$(echo "$changes" | gawk '/^  \* Merged in \[[0-9]+\] from [^: ]+/ {sub(":",""); print $6;}' )
+note "Contributors: $contributors"
 
 note "Setting the current time on the release notes in the changelog file ..."
 $do sed -r -i -e "1,/^ -- /s/([A-Za-z-]+ <[a-z0-9.-]+@[a-z0-9.-]+>  ).*$/\1$(TZ=UTC date +'%d %b %Y %H:%M:%S %z')/" changelog