]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
meson: Fix version script
authorJan Janssen <medhefgo@web.de>
Mon, 28 Aug 2023 17:18:37 +0000 (19:18 +0200)
committerLuca Boccassi <luca.boccassi@gmail.com>
Tue, 29 Aug 2023 00:08:38 +0000 (01:08 +0100)
Apparently, the `|` has a higher priority…

meson.build

index 910e06c7834b11f396a8ee71289733baca913c39..6d0cddf7d8cd155f82640e5b0bb0ad4ee832a3c8 100644 (file)
@@ -1813,8 +1813,8 @@ version_tag = get_option('version-tag')
 if version_tag == '' and git.found() and fs.exists(project_source_root / '.git')
         # If the working tree has no tags (CI builds), the first git-describe will fail
         # and we fall back to project_version-commitid instead.
-        version_cmd = '''git -C "$1" describe --abbrev=7 --dirty=^ 2>/dev/null ||
-                         echo "$2-$(git -C "$1" describe --always --abbrev=7)" |
+        version_cmd = '''(git -C "$1" describe --abbrev=7 --dirty=^ 2>/dev/null ||
+                          echo "$2-$(git -C "$1" describe --always --abbrev=7)") |
                          sed 's/^v//; s/-rc/~rc/' '''
 else
         version_cmd = '''echo "$2" '''