Merge branch 'devel-2.3'

* devel-2.3:
  Correct version check for release candidates
  config.py: need explicit %-formatting in errors.OpPrereqError.
  Fix version check
  Add script to check version format

Conflicts:
	Makefile.am

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>

diff --git a/Makefile.am b/Makefile.am
index 4bfd094..7d61f71 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,6 +14,7 @@ BUILD_BASH_COMPLETION = $(top_srcdir)/autotools/build-bash-completion
 RUN_IN_TEMPDIR = $(top_srcdir)/autotools/run-in-tempdir
 CHECK_PYTHON_CODE = $(top_srcdir)/autotools/check-python-code
 CHECK_MAN = $(top_srcdir)/autotools/check-man
+CHECK_VERSION = $(top_srcdir)/autotools/check-version
 REPLACE_VARS_SED = autotools/replace_vars.sed
 
 clientdir = $(pkgpythondir)/client
@@ -337,6 +338,7 @@ EXTRA_DIST = \
        autotools/check-python-code \
        autotools/check-man \
        autotools/check-tar \
+       autotools/check-version \
        autotools/gen-coverage \
        autotools/testrunner \
        $(RUN_IN_TEMPDIR) \
@@ -747,6 +749,7 @@ check-dirs: $(BUILT_SOURCES)
 
 check-local: check-dirs
        $(CHECK_PYTHON_CODE) $(check_python_code)
+       $(CHECK_VERSION) $(VERSION) $(top_srcdir)/NEWS
 
 .PHONY: lint
 lint: $(BUILT_SOURCES)

diff --git a/autotools/check-version b/autotools/check-version
new file mode 100755 (executable)
index 0000000..be7ecef
--- /dev/null
+++ b/autotools/check-version
@@ -0,0 +1,51 @@
+#!/bin/bash
+#
+
+# Copyright (C) 2010 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+set -e
+
+# Enable Bash-specific patterns
+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])) : ;;
+
+  *)
+    echo "Invalid version format: $version" >&2
+    exit 1
+  ;;
+esac
+
+readonly newsver="Version ${version/\~/ }"
+
+if ! grep -q -x "$newsver" $newsfile
+then
+  echo "Unable to find heading '$newsver' in NEWS" >&2
+  exit 1
+fi
+
+exit 0

diff --git a/lib/config.py b/lib/config.py
index 35ed410..a903e18 100644 (file)
--- a/lib/config.py
+++ b/lib/config.py
@@ -886,7 +886,7 @@ class ConfigWriter:
     for nodegroup in self._config_data.nodegroups.values():
       if nodegroup.name == target:
         return nodegroup.uuid
-    raise errors.OpPrereqError("Nodegroup '%s' not found", target)
+    raise errors.OpPrereqError("Nodegroup '%s' not found" % target)
 
   def _UnlockedGetNodeGroup(self, uuid):
     """Lookup a node group.