From: Guillaume Abrioux Date: Thu, 31 May 2018 09:25:49 +0000 (+0200) Subject: Makefile: followup on #2585 X-Git-Tag: v3.0.36 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8f7e9f0f81d927397edebfc6bcffcb7c876f270d;p=ceph-ansible.git Makefile: followup on #2585 Fix a typo in `tag` target, double quote are missing here. Without them, the `make tag` command fails like this: ``` if [[ "v3.0.35" == ]]; then \ echo "e5f2df8 on stable-3.0 is already tagged as v3.0.35"; \ exit 1; \ fi /bin/sh: -c: line 0: unexpected argument `]]' to conditional binary operator /bin/sh: -c: line 0: syntax error near `;' /bin/sh: -c: line 0: `if [[ "v3.0.35" == ]]; then echo "e5f2df8 on stable-3.0 is already tagged as v3.0.35"; exit 1; fi' make: *** [tag] Error 2 ``` Signed-off-by: Guillaume Abrioux (cherry picked from commit 0b67f42feb95594fb403908d61383dc25d6cd342) Signed-off-by: Guillaume Abrioux --- diff --git a/Makefile b/Makefile index 87089ea5b..b7435fd14 100644 --- a/Makefile +++ b/Makefile @@ -75,7 +75,7 @@ tag: | sed -E "s/.*[^0-9]([0-9]+)$$/\1/")) $(eval NEXTNUM=$(shell echo $$(($(LASTNUM)+1)))) $(eval NEXTTAG=$(shell echo $(TAG) | sed "s/$(LASTNUM)$$/$(NEXTNUM)/")) - if [[ "$(TAG)" == $(git describe --tags --match 'v*') ]]; then \ + if [[ "$(TAG)" == "$(git describe --tags --match 'v*')" ]]; then \ echo "$(SHORTCOMMIT) on $(BRANCH) is already tagged as $(TAG)"; \ exit 1; \ fi