From: Dave Hart <hart@ntp.org>
Date: Tue, 22 Dec 2009 08:36:49 +0000 (+0000)
Subject: UpdatePoint:
X-Git-Tag: NTP_4_2_7P3~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d7010983f2c1344f9b62f7da48ea00058cc0e10;p=thirdparty%2Fntp.git

UpdatePoint:
  correct handling of beta-free stable RC bumps

bk: 4b308521v55gMLQyq8D8o6l9IXMJsg
---

diff --git a/scripts/UpdatePoint b/scripts/UpdatePoint
index 37331859b..309cdccb6 100755
--- a/scripts/UpdatePoint
+++ b/scripts/UpdatePoint
@@ -156,14 +156,18 @@ case "$repo" in
 	esac
 	;;
      beta)
-	case "$betapoint" in
-	 0) echo "betapoint is 0 and prerelease is beta, you probably intended"
-	    echo "prerelease=  (that is, empty).  It will then be changed to"
-	    echo "beta by this script, starting the first beta for the next"
-	    echo "point release."
+	case "$betapoint::$rcpoint" in
+	 [1-9]*::*)
+	    bp=0
+	    bbp=1
+	    ;;
+	 0::) echo "betapoint is 0, rcpoint emtpy, and prerelease is beta."
+	    echo "You probably intended prerelease=  (that is, empty).  It"
+	    echo "will then be changed to beta by this script, starting the"
+	    echo "first beta for the next point release."
 	    exit 1
 	    ;;
-	 [1-9]*)
+	 *)
 	    bp=0
 	    bbp=1
 	    ;;
@@ -178,7 +182,7 @@ case "$repo" in
 	;;
      rc|RC)
 	case "$rcpoint" in
-	 ''|[1-9]*)
+	 '')
 	    case "$betapoint" in
 	     0) # bp=1
 		;;
@@ -187,6 +191,10 @@ case "$repo" in
 	    esac
 	    crcp=i
 	    ;;
+	 [1-9]*)
+	    bp=0
+	    crcp=i
+	    ;;
 	 [Gg][Oo])
 	    bp=0
 	    crcp=z