diff options
| author | Scott Moser <smoser@brickies.net> | 2017-01-20 09:36:51 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-01-23 09:39:01 -0500 |
| commit | a3376d45c83e90150d8de79a2b31282a7d760bd7 (patch) | |
| tree | 42cdd2896679f37f891f790f3b9b8a499b77db16 /tools | |
| parent | b71592ce0e0a9f9f9f225315015ca57b312ad30d (diff) | |
| download | vyos-cloud-init-a3376d45c83e90150d8de79a2b31282a7d760bd7.tar.gz vyos-cloud-init-a3376d45c83e90150d8de79a2b31282a7d760bd7.zip | |
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.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/make-tarball | 2 | ||||
| -rwxr-xr-x | tools/read-version | 2 |
2 files changed, 2 insertions, 2 deletions
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() |