Postpone release of 2.9.1

[ganeti-local] / autotools / check-version

diff --git a/autotools/check-version b/autotools/check-version
index 1a2e2b3..9b9c31a 100755 (executable)
--- a/autotools/check-version
+++ b/autotools/check-version
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 
-# Copyright (C) 2010 Google Inc.
+# Copyright (C) 2010,2013 Google Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,14 +24,15 @@ set -e
 shopt -s extglob
 
 readonly version=$1
+readonly newsfile=$2
 readonly numpat='+([0-9])'
 
 case "$version" in
   # Format "x.y.z"
   $numpat.$numpat.$numpat) : ;;
 
-  # Format "x.y.z~rcN" or "x.y.z~betaN" for N > 0
-  $numpat.$numpat.$numpat~@(rc|beta)[1-9]*([0-9])) : ;;
+  # Format "x.y.z~rcN" or "x.y.z~betaN" or "x.y.z~alphaN" for N > 0
+  $numpat.$numpat.$numpat~@(rc|beta|alpha)[1-9]*([0-9])) : ;;
 
   *)
     echo "Invalid version format: $version" >&2
@@ -39,12 +40,19 @@ case "$version" in
   ;;
 esac
 
-readonly newsver="Version ${version/~/}"
+readonly newsver="Version ${version/\~/ }"
 
-if ! grep -q -x "$newsver" NEWS
+# Only alpha versions are allowed not to have their own NEWS section yet
+set +e
+FOUND=x`echo $version | grep "alpha[1-9]*[0-9]$"`
+set -e
+if [ $FOUND == "x" ]
 then
-  echo "Unable to find heading '$newsver' in NEWS" >&2
-  exit 1
+  if ! grep -q -x "$newsver" $newsfile
+  then
+    echo "Unable to find heading '$newsver' in NEWS" >&2
+    exit 1
+  fi
 fi
 
 exit 0