build: fix running Make on a branch with tags other than master

running 'make' on a git branch other than master would fail with
complaint that the tools/read-version reported a different version
than the code.

Change to only consider tags starting with 0-9 in read-version.

3 files changed, 6 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index ed631cf7..18ec5680 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,8 @@ ifeq ($(distro),)
   distro = redhat
 endif
 
-READ_VERSION=$(shell $(PYVER) $(CWD)/tools/read-version)
+READ_VERSION=$(shell $(PYVER) $(CWD)/tools/read-version || \
+  echo read-version-failed)
 CODE_VERSION=$(shell $(PYVER) -c "from cloudinit import version; print(version.version_string())")
 
 
@@ -62,8 +63,8 @@ test: $(unittests)
 
 check_version:
 	@if [ "$(READ_VERSION)" != "$(CODE_VERSION)" ]; then \
-	    echo "Error: read-version version $(READ_VERSION)" \
-	    "not equal to code version $(CODE_VERSION)"; exit 2; \
+	    echo "Error: read-version version '$(READ_VERSION)'" \
+	    "not equal to code version '$(CODE_VERSION)'"; exit 2; \
 	    else true; fi
 
 clean_pyc:
diff --git a/tools/make-tarball b/tools/make-tarball
index c150dd2f..91c45624 100755
--- a/tools/make-tarball
+++ b/tools/make-tarball
@@ -35,7 +35,7 @@ while [ $# -ne 0 ]; do
 done
 
 rev=${1:-HEAD}
-version=$(git describe ${long_opt} $rev)
+version=$(git describe "--match=[0-9]*" ${long_opt} $rev)
 
 archive_base="cloud-init-$version"
 if [ -z "$output" ]; then
diff --git a/tools/read-version b/tools/read-version
index 3b30b497..ddb28383 100755
--- a/tools/read-version
+++ b/tools/read-version
@@ -56,7 +56,7 @@ if os.path.isdir(os.path.join(_tdir, ".git")) and which("git"):
     flags = []
     if use_tags:
         flags = ['--tags']
-    cmd = ['git', 'describe'] + flags
+    cmd = ['git', 'describe', '--match=[0-9]*'] + flags
 
     version = tiny_p(cmd).strip()