X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=final_msg;h=979da9b6bfa196a37dd87260a4427d5e9def2801;hb=HEAD;hp=5e00ddaf0d06c9d7621ad0ef1b7325069b07ea95;hpb=9064ba9aab9c9222ade4c0738922a790c87ce107;p=next-scripts

diff --git a/final_msg b/final_msg
index 5e00dda..979da9b 100755
--- a/final_msg
+++ b/final_msg
@@ -1,20 +1,25 @@
 #!/bin/bash
 
-. "$(dirname $0)/common.sh" ""
+tools_dir=$(dirname "$0")
+. "$tools_dir/common.sh" ""
 
-to="linux-next@vger.kernel.org"
-cc="linux-kernel@vger.kernel.org"
+to="Linux Next Mailing List <linux-next@vger.kernel.org>"
+cc="Linux Kernel Mailing List <linux-kernel@vger.kernel.org>"
 subject="linux-next: Tree for $(date --date "5 hours ago" '+%b %-d')"
 prev=$(git tag -l next-* | sort | tail -n 2 | head -n 1 | sed 's/next-//')
 nmc=$(git rev-list --no-merges --count origin/master..HEAD^)
 ss=$(git diff --shortstat -M -C origin/master..HEAD^)
-ntrees=$(wc -l <../etc/control)
+ntrees=$(grep -v -c '^#' "$CTRL_FILE")
+npend=$(sed '/^#/d;/^pending-fixes/q' "$CTRL_FILE" | wc -l)
+npend=$(( npend - 2 ))
 
-sed -e 's/^\(Changes since\) [0-9]*:/\1 '"$prev"':/' \
+sed -i.bak -e 's/^\(Changes since\) [0-9]*:/\1 '"$prev"':/' \
     -e 's/^\(Non-merge commits .*:\) [0-9]*/\1 '"$nmc"'/'\
     -e 's/^ *[0-9]* files changed,.*$/'"$ss"'/' \
     -e 's/^\(I am currently merging\) [0-9]* /\1 '"$ntrees"' /' \
-    ../last_msg |
-	$(dirname $0)/send_email "$to" "$cc" "$subject"
+    -e 's/ [0-9]* \(trees of bug\)/ '"$npend"' \1/' \
+    ../last_msg
+
+"$tools_dir/send_email" "$subject" "$to" "$cc" <../last_msg
 
 exit 0