X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=devel%2Frelease-checks.sh;h=bf0d68a444b6ce940dc7e8f265f8efff56c7f4bf;hp=8938905e0462e079b6edc520cca2f2f468b32d27;hb=6d5c7b3ca50cb2ce36d4a2d6e6f064afcba7410b;hpb=c734dd75344ea0d1701969a8ecb9ff00d2bd5531

diff --git a/devel/release-checks.sh b/devel/release-checks.sh
index 8938905e..bf0d68a4 100755
--- a/devel/release-checks.sh
+++ b/devel/release-checks.sh
@@ -59,6 +59,17 @@ readonly VERSION
 
 # In the rest of this file, tests collect list of errors to be fixed
 
+echo -n "Checking that git working directory is clean... "
+git_status=`git status --porcelain`
+if [ "$git_status" = '' ]
+then
+	echo Yes.
+else
+	echo No.
+	append_emsg "Git working directory is not clean (git status --porcelain)."
+fi
+unset git_status
+
 verfail ()
 {
 	echo No.
@@ -68,7 +79,7 @@ verfail ()
 
 echo -n "Checking that '$VERSION' is good with digits and periods... "
 case $VERSION in
-	*[^0-9.]*)
+	*[!0-9.]*)
 		verfail "'$VERSION' contains other characters than digits and periods" ;;
 	.*)	verfail "'$VERSION' begins with a period" ;;
 	*.)	verfail "'$VERSION' ends with a period" ;;
@@ -130,7 +141,7 @@ else
 fi
 
 echo -n "Checking that python bindings version is $VERSION... "
-py_version=`python -c "execfile('$PV_FILE'); print __VERSION__"`
+py_version=`python -c "with open('$PV_FILE') as vf: exec(vf.read()); print(__VERSION__)"`
 if [ "$py_version" = "$VERSION" ]
 then
 	echo Yes.
@@ -196,46 +207,6 @@ case $news_date in
 	append_emsg "Date '$news_date' in NEWS file is not in format (yyyy-mm-dd)"
 esac
 
-readonly DATE=${news_date//[()]/} # bash feature
-manthdata ()
-{
-	set x $*
-	if [ $# != 7 ]
-	then
-		append_emsg "'$mp' has too many '.TH' lines"
-		man_mismatch=1
-	fi
-	man_date=${5-} man_version=${7-}
-}
-
-echo -n "Checking that manual page dates and versions are $DATE and $VERSION... "
-manfiles=`find man -type f | sort`
-man_pages_ok=Yes
-for mp in $manfiles
-do
-	case $mp in
-		*.[0-9]) ;; # fall below this 'case ... esac'
-
-		*/Makefile.local | */Makefile ) continue ;;
-		*/.gitignore)	continue ;;
-		*.bak)		continue ;;
-
-		*)	append_emsg "'$mp': extra file"
-			man_pages_ok=No
-			continue
-	esac
-	manthdata `sed -n '/^[.]TH NOTMUCH/ { y/"/ /; p; }' "$mp"`
-	if [ "$man_version" != "$VERSION" ]
-	then	append_emsg "Version '$man_version' is not '$VERSION' in $mp"
-		mman_pages_ok=No
-	fi
-	if [ "$man_date" != "$DATE" ]
-	then	append_emsg "DATE '$man_date' is not '$DATE' in $mp"
-		man_pages_ok=No
-	fi
-done
-echo $man_pages_ok.
-
 if [ -n "$emsgs" ]
 then
 	echo