system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-21 10:17:21 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

meson: Fix version script

Browse source 
Apparently, the `|` has a higher priority…
This commit is contained in:
Jan Janssen 2023-08-28 19:18:37 +02:00 committed by Luca Boccassi
parent 5599c84bcd
commit 29c2f6ac4b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
meson.build
View 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" '''