From: Mike Yuan <me@yhndnzj.com>
Date: Wed, 13 Nov 2024 21:30:40 +0000 (+0100)
Subject: tmpfiles.d/meson: remove the need of specifying empty condition
X-Git-Tag: v257-rc2~22^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b8b32cb091748312dc626c53d00ca46cb322310;p=thirdparty%2Fsystemd.git

tmpfiles.d/meson: remove the need of specifying empty condition
---

diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build
index 43a9232ca4d..0fe5bfc89fe 100644
--- a/tmpfiles.d/meson.build
+++ b/tmpfiles.d/meson.build
@@ -4,28 +4,28 @@ if conf.get('ENABLE_TMPFILES') != 1
         subdir_done()
 endif
 
-files = [['README',               ''],
-         ['home.conf',            ''],
-         ['journal-nocow.conf',   ''],
+files = [['README'],
+         ['home.conf'],
+         ['journal-nocow.conf'],
          ['portables.conf',       'ENABLE_PORTABLED'],
          ['systemd-network.conf', 'ENABLE_NETWORKD'],
          ['systemd-nologin.conf', 'HAVE_PAM'],
          ['systemd-nspawn.conf',  'ENABLE_MACHINED'],
          ['systemd-pstore.conf',  'ENABLE_PSTORE'],
          ['systemd-resolve.conf', 'ENABLE_RESOLVE'],
-         ['systemd-tmp.conf',     ''],
-         ['tmp.conf',             ''],
-         ['x11.conf',             ''],
-         ['provision.conf',       ''],
-         ['credstore.conf',       ''],
+         ['systemd-tmp.conf'],
+         ['tmp.conf'],
+         ['x11.conf'],
+         ['provision.conf'],
+         ['credstore.conf'],
         ]
 
-foreach pair : files
-        if pair[1] == '' or conf.get(pair[1]) == 1
-                install_data(pair[0], install_dir : tmpfilesdir)
+foreach f : files
+        if f.length() == 1 or conf.get(f[1]) == 1
+                install_data(f[0], install_dir : tmpfilesdir)
         else
                 message('Not installing tmpfiles.d/@0@ because @1@ is @2@'
-                        .format(pair[0], pair[1], conf.get(pair[1], 0)))
+                        .format(f[0], f[1], conf.get(f[1], 0)))
         endif
 endforeach
 
@@ -34,25 +34,25 @@ in_files = [
         ['20-systemd-ssh-generator.conf', 'ENABLE_SSH_PROXY_CONFIG'],
         ['20-systemd-stub.conf',          'ENABLE_EFI'],
         ['20-systemd-userdb.conf',        'ENABLE_SSH_USERDB_CONFIG'],
-        ['etc.conf',                      ''],
+        ['etc.conf'],
         ['legacy.conf',                   'HAVE_SYSV_COMPAT'],
-        ['static-nodes-permissions.conf', ''],
-        ['systemd.conf',                  ''],
-        ['var.conf',                      ''],
+        ['static-nodes-permissions.conf'],
+        ['systemd.conf'],
+        ['var.conf'],
 ]
 
-foreach pair : in_files
-        if pair[1] == '' or conf.get(pair[1]) == 1
+foreach f : in_files
+        if f.length() == 1 or conf.get(f[1]) == 1
                 custom_target(
-                        pair[0],
-                        input : pair[0] + '.in',
-                        output: pair[0],
+                        f[0],
+                        input : f[0] + '.in',
+                        output: f[0],
                         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
                         install : true,
                         install_dir : tmpfilesdir)
         else
                 message('Not installing tmpfiles.d/@0@ because @1@ is @2@'
-                        .format(pair[0], pair[1], conf.get(pair[1], 0)))
+                        .format(f[0], f[1], conf.get(f[1], 0)))
         endif
 endforeach