[SCM] Samba Shared Repository - branch v4-6-test updated

[Stefan Metzmacher]

The branch, v4-6-test has been updated
       via  4817385 script/release.sh: fix off by 1 error in announce.${tagname}.mail.txt creation
      from  d5eebe5 winbind: Don't add duplicate IDs in wbinfo -r

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-6-test


- Log -----------------------------------------------------------------
commit 4817385baccf67e962572c7f1c293dde81e14d19
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Jan 12 10:40:37 2017 +0100

    script/release.sh: fix off by 1 error in announce.${tagname}.mail.txt creation
    
    Pair-Programmed-With: Karolin Seeger <kseeger at samba.org>
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    
    Autobuild-User(master): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(master): Thu Jan 12 15:34:25 CET 2017 on sn-devel-144
    
    (cherry picked from commit 7870c645b79da647bae45b4dc95e7d6e9abcd91a)
    
    Autobuild-User(v4-6-test): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(v4-6-test): Thu Jan 26 04:06:28 CET 2017 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 script/release.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/script/release.sh b/script/release.sh
index 769f742..b533e25 100755
--- a/script/release.sh
+++ b/script/release.sh
@@ -830,7 +830,8 @@ announcement_samba_stable() {
 			top=$(cat ${TMPDIR}/WHATSNEW.txt | wc -l)
 		}
 		local skip=$(cat ${TMPDIR}/WHATSNEW.txt | grep -n '^[^ ]' | head -1 | cut -d ':' -f1)
-		local bottom=$(expr ${top} - \( ${skip} - 1 \))
+		local headlimit=$(expr ${top} - 1 )
+		local taillimit=$(expr ${headlimit} - \( ${skip} - 1 \))
 
 		cat "announce.${tagname}.quotation.txt"
 		echo ""
@@ -838,7 +839,7 @@ announcement_samba_stable() {
 		echo "Release Announcements"
 		echo "---------------------"
 		echo ""
-		head -${top} ${TMPDIR}/WHATSNEW.txt | tail -${bottom}
+		head -${headlimit} ${TMPDIR}/WHATSNEW.txt | tail -${taillimit}
 		echo ""
 		echo "================"
 		echo "Download Details"


-- 
Samba Shared Repository