summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2019-12-13 13:41:42 +0100
committerThomas Haller <thaller@redhat.com>2019-12-13 13:48:25 +0100
commit0e3400bef730b2c52d48a1d1d4de58e9bcf2dcaa (patch)
treeaa5c2b5075a043b0f13b90909dd324b059ccb6ea
parentf5b0713651f8603f93be82a47b22ed578762f5eb (diff)
downloadNetworkManager-0e3400bef730b2c52d48a1d1d4de58e9bcf2dcaa.tar.gz
meson/build: avoid using ternary as it breaks older meson
See mesonbuild issue 5003. Oddly, this isn't inside a method call, while we use ternaries inside a method calls otherwise. Anyway, workaround this and avoid the crash. Fixes: c21c6bc0be2a ('build/meson: allow configuring default for main.auth-polkit setting')
-rw-r--r--meson.build8
1 files changed, 7 insertions, 1 deletions
diff --git a/meson.build b/meson.build
index 022a90fec1..faca209e1f 100644
--- a/meson.build
+++ b/meson.build
@@ -940,7 +940,13 @@ output += ' session tracking: ' + ','.join(session_trackers) + '\n'
output += ' suspend/resume: ' + suspend_resume + '\n'
output += ' policykit: ' + enable_polkit.to_string() + ' (default: ' + config_auth_polkit_default + ')'
if enable_polkit
- output += ' (' + (enable_modify_system ? 'permissive' : 'restrictive') + ' modify.system)'
+ output += ' ('
+ if enable_modify_system
+ output += 'permissive'
+ else
+ output += 'restrictive'
+ endif
+ output += ' modify.system)'
endif
output += '\n'
output += ' polkit agent: ' + enable_polkit_agent.to_string() + '\n'