From 64ebe006c907cbef959f0fe510b8239f3ba5cb23 Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Sat, 5 Apr 2014 12:47:29 +0300 Subject: [PATCH] [PATCH 1/1] release-checks: removed manual page version check --- 11/ba8055bdecc3876ddabf6c9a36467b2d65fcd6 | 115 ++++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 11/ba8055bdecc3876ddabf6c9a36467b2d65fcd6 diff --git a/11/ba8055bdecc3876ddabf6c9a36467b2d65fcd6 b/11/ba8055bdecc3876ddabf6c9a36467b2d65fcd6 new file mode 100644 index 000000000..2b317f56d --- /dev/null +++ b/11/ba8055bdecc3876ddabf6c9a36467b2d65fcd6 @@ -0,0 +1,115 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 747A5431FAF + for ; Sat, 5 Apr 2014 02:47:48 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id g7cD64blvxsZ for ; + Sat, 5 Apr 2014 02:47:42 -0700 (PDT) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 8918E431FAE + for ; Sat, 5 Apr 2014 02:47:42 -0700 (PDT) +Received: by guru.guru-group.fi (Postfix, from userid 501) + id 7842F100063; Sat, 5 Apr 2014 12:47:30 +0300 (EEST) +From: Tomi Ollila +To: notmuch@notmuchmail.org +Subject: [PATCH 1/1] release-checks: removed manual page version check +Date: Sat, 5 Apr 2014 12:47:29 +0300 +Message-Id: <1396691249-29402-1-git-send-email-tomi.ollila@iki.fi> +X-Mailer: git-send-email 1.8.0 +Cc: tomi.ollila@iki.fi +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sat, 05 Apr 2014 09:47:48 -0000 + +Manual pages are now generated and during the generation the version +string is read from `version` file, so this (currently failing) test +checking manual page versions can be removed. + +While at it, changed the case pattern *[^0-9.]* +to its portable alternative *[!0-9.]* +--- + devel/release-checks.sh | 42 +----------------------------------------- + 1 file changed, 1 insertion(+), 41 deletions(-) + +diff --git a/devel/release-checks.sh b/devel/release-checks.sh +index 8938905..797d62a 100755 +--- a/devel/release-checks.sh ++++ b/devel/release-checks.sh +@@ -68,7 +68,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" ;; +@@ -196,46 +196,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 +-- +1.8.0 + -- 2.26.2