diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-11-13 22:22:58 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-11-13 22:34:33 +0100 |
| commit | 5bc655cd20569068fde2f45ecec78c36e8ec38b0 (patch) | |
| tree | afb40ae8e6f22c4a48136dee81697ce011ffcf38 /meson.build | |
| parent | 3602ca6f0c6c7b79458ab80184b4af5334f3a843 (diff) | |
| download | systemd-5bc655cd20569068fde2f45ecec78c36e8ec38b0.tar.gz | |
meson: avoid ternary op in .format()
meson 0.49 can't parse that for some reason. I'm keeping this separate so it
can be reverted easily when we bump required meson version.
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 403705a6b1..f6771af2c6 100644 --- a/meson.build +++ b/meson.build @@ -827,8 +827,13 @@ conf.set10('LOG_TRACE', get_option('log-trace')) default_user_path = get_option('user-path') if default_user_path != '' conf.set_quoted('DEFAULT_USER_PATH', default_user_path) + default_user_path_display = default_user_path +else + # meson 0.49 fails when ?: is used in .format() + default_user_path_display = '(same as system services)' endif + ##################################################################### threads = dependency('threads') @@ -3124,8 +3129,7 @@ status = [ 'default net.naming-scheme setting: @0@'.format(default_net_naming_scheme), 'default KillUserProcesses setting: @0@'.format(kill_user_processes), 'default locale: @0@'.format(default_locale), - 'default user $PATH: @0@'.format( - default_user_path != '' ? default_user_path : '(same as system services)'), + 'default user $PATH: @0@'.format(default_user_path_display), 'systemd service watchdog: @0@'.format(watchdog_opt)] alt_dns_servers = '\n '.join(dns_servers.split(' ')) |