]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test-specifier: Ignore -ENOPKG from specifier_printf()
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Sat, 6 May 2023 09:33:22 +0000 (11:33 +0200)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Mon, 8 May 2023 16:53:27 +0000 (18:53 +0200)
If /etc/machine-id contains "uninitialized", specifier_printf() with
%m will fail with ENOPKG, so ignore that error as well.

src/test/test-specifier.c

index d2a7f922bdf67eab7ffcb8e5a64322f6fb4ff741..1e4659984388b8f7b221492bb214e3f8f315cec2 100644 (file)
@@ -138,7 +138,7 @@ TEST(specifiers) {
                 xsprintf(spec, "%%%c", s->specifier);
 
                 r = specifier_printf(spec, SIZE_MAX, specifier_table, NULL, NULL, &resolved);
-                if (s->specifier == 'm' && IN_SET(r, -EUNATCH, -ENOMEDIUM)) /* machine-id might be missing in build chroots */
+                if (s->specifier == 'm' && IN_SET(r, -EUNATCH, -ENOMEDIUM, -ENOPKG)) /* machine-id might be missing in build chroots */
                         continue;
                 assert_se(r >= 0);