Tweaked the use of the -p otpion of bin/mkrelease. Added sbirkholz@amsl.com to the release email addressees.

 - Legacy-Id: 13222

Author: levkowetz

bin/mkrelease

@@ -178,22 +178,24 @@ changes=$( sed -n "/^$PROJ ($VER.*)/,/^ -- /p" changelog )
 [ "$changes" ] || die "No changelog information for $VER found"
 #note "$changes"
 
-note "Checking that we don't have both schema and data migrations ..."
-cur=$(svn info | awk '/^Revision:/ { print $2 }')
-migrations=$(svn log $PWD -v -r HEAD:$((cur-100)) | sed -n -e '1,/^Set version info and settings back to development mode/p' | grep '^...A /.*/migrations/0.*.py' | cut -c6- | awk '{ print $1 }' | sed -re 's|/trunk/||')
-if [ -n "$migrations" -a -z "$PERMIT_MIGR_MIX" ]; then
-    datamigr=$(for m in "$migrations"; do egrep -sl 'migrations\.RunPython' $m; done || true)
-    schemamigr=$(for m in "$migrations"; do egrep -sl 'migrations\.(Add|Alter|Create|Delete|Remove|Rename)(Field|Model|UniqueTogether)' $m; done || true)
-    if [ -n "$datamigr" -a -n "$schemamigr" ]; then
-	echo -e "\n   Schema migrations:"
-	for m in $schemamigr; do
-	    echo "        $m"
-	done
-	echo -e "\n   Data migrations:"
-	for m in $datamigr; do
-	    echo "        $m"
-	done
-	die "\n   Found both data migrations and schema migrations in this release.\n   This is likely to cause delay between schema changes and deployment,\n   which means the old code will run on the new schema longer than necessary."
+if [ -z "$PERMIT_MIGR_MIX" ]; then
+    note "Checking that we don't have both schema and data migrations ..."
+    cur=$(svn info | awk '/^Revision:/ { print $2 }')
+    migrations=$(svn log $PWD -v -r HEAD:$((cur-100)) | sed -n -e '1,/^Set version info and settings back to development mode/p' | grep '^...A /.*/migrations/0.*.py' | cut -c6- | awk '{ print $1 }' | sed -re 's|/trunk/||')
+    if [ -n "$migrations" ]; then
+	datamigr=$(for m in "$migrations"; do egrep -sl 'migrations\.RunPython' $m; done || true)
+	schemamigr=$(for m in "$migrations"; do egrep -sl 'migrations\.(Add|Alter|Create|Delete|Remove|Rename)(Field|Model|UniqueTogether)' $m; done || true)
+	if [ -n "$datamigr" -a -n "$schemamigr" ]; then
+	    echo -e "\n   Schema migrations:"
+	    for m in $schemamigr; do
+		echo "        $m"
+	    done
+	    echo -e "\n   Data migrations:"
+	    for m in $datamigr; do
+		echo "        $m"
+	    done
+	    die "\n   Found both data migrations and schema migrations in this release.\n   This is likely to cause delay between schema changes and deployment,\n   which means the old code will run on the new schema longer than necessary."
+	fi
     fi
 fi
 
@@ -313,7 +315,7 @@ Regards,
 	(via the mkrelease script)
 " > ~/src/db/mail/release-mail-v$VER.txt
 
-cat ~/src/db/mail/release-mail-v$VER.txt | $do mail -s "New datatracker release: v$VER" housley@vigilsec.com rjs@nostrum.com henrik@levkowetz.com -c glen@amsl.com -c fenner@fenron.net -c cmorgan@amsl.com -c avezza@amsl.com -c amorris@amsl.com -c smccammon@amsl.com -c kmoreland@amsl.com -c olau@iola.dk -c mlarson@amsl.com $contributors
+cat ~/src/db/mail/release-mail-v$VER.txt | $do mail -s "New datatracker release: v$VER" housley@vigilsec.com rjs@nostrum.com henrik@levkowetz.com -c glen@amsl.com -c fenner@fenron.net -c cmorgan@amsl.com -c avezza@amsl.com -c amorris@amsl.com -c smccammon@amsl.com -c kmoreland@amsl.com -c olau@iola.dk -c mlarson@amsl.com -c sbirkholz@amsl.com $contributors
 
 cat ~/src/db/mail/release-mail-v$VER.txt | $do mail -s "New datatracker release: v$VER" iesg@ietf.org wgchairs@ietf.org codesprints@ietf.org -b henrik@levkowetz.com