]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
Makefile: followup on #2585 v3.0.36
authorGuillaume Abrioux <gabrioux@redhat.com>
Thu, 31 May 2018 09:25:49 +0000 (11:25 +0200)
committerGuillaume Abrioux <gabrioux@redhat.com>
Fri, 1 Jun 2018 10:52:12 +0000 (12:52 +0200)
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 <gabrioux@redhat.com>
(cherry picked from commit 0b67f42feb95594fb403908d61383dc25d6cd342)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
Makefile

index 87089ea5b5ae751c2fc49a5408e7735e3abb2e2b..b7435fd143d935896df6dc4fe212d8ccd5d933ff 100644 (file)
--- 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