Add the correct changelog to vote mail
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/847634e3 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/847634e3 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/847634e3 Branch: refs/heads/build/wicket-7.0.0-M6 Commit: 847634e32e7eaf06811ae9e143200bde1d73f945 Parents: 7756ff8 Author: Martijn Dashorst <[email protected]> Authored: Fri Jun 12 18:49:31 2015 +0200 Committer: Martijn Dashorst <[email protected]> Committed: Fri Jun 12 18:49:31 2015 +0200 ---------------------------------------------------------------------- release-dashorst.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/847634e3/release-dashorst.sh ---------------------------------------------------------------------- diff --git a/release-dashorst.sh b/release-dashorst.sh index e5ff22d..80dac3c 100755 --- a/release-dashorst.sh +++ b/release-dashorst.sh @@ -299,13 +299,16 @@ $(cat $i.asc) done popd > /dev/null -echo "======================================================================== + echo "======================================================================== CHANGELOG for $version: " >> /tmp/release-$version-sigs.txt -awk "/Release Notes - Wicket - Version $version/{flag=1;next} /==================/{flag=0} flag { print }" CHANGELOG-6.x >> /tmp/release-$version-sigs.txt - +if [ -f "/tmp/release-notes-$version.txt" ] ; then + tail -n +4 /tmp/release-notes-$version.txt >> /tmp/release-$version-sigs.txt +else + awk "/Release Notes - Wicket - Version $version/{flag=1;next} /==================/{flag=0} flag { print }" CHANGELOG-$major_version.x >> /tmp/release-$version-sigs.txt +fi echo "Generating Vote email"
