]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
load-fragment: Remove faulty assertion
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Wed, 3 Jul 2024 17:33:01 +0000 (19:33 +0200)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Wed, 3 Jul 2024 18:49:44 +0000 (20:49 +0200)
Followup for 453cb5d01e587ff6d9fa426397c0d1b858f8f832

Fixes the following assertion:

"""
x86 130 ~/systemd ❯❯❯ meson compile -C build
ninja: Entering directory `/home/tfleig/systemd/build'
[2/5] Generating export-dbus-interfaces with a custom command
FAILED: interfaces
/home/tfleig/systemd/tools/dbus_exporter.py interfaces /home/tfleig/systemd/build/systemd /home/tfleig/systemd/build/systemd-homed /home/tfleig/systemd/build/systemd-hostnamed /home/tfleig/systemd/build/systemd-importd /home/tfleig/systemd/build/systemd-localed /home/tfleig/systemd/build/systemd-logind /home/tfleig/systemd/build/systemd-machined /home/tfleig/systemd/build/systemd-networkd /home/tfleig/systemd/build/systemd-oomd /home/tfleig/systemd/build/systemd-portabled /home/tfleig/systemd/build/systemd-resolved /home/tfleig/systemd/build/systemd-timedated
Assertion '__unique_prefix__expr_91' failed at src/core/load-fragment.c:3912, function config_parse_tasks_max(). Aborting.
Traceback (most recent call last):
  File "/home/tfleig/systemd/tools/dbus_exporter.py", line 45, in <module>
    main()
  File "/home/tfleig/systemd/tools/dbus_exporter.py", line 42, in main
    extract_interfaces_xml(args.output, exe)
  File "/home/tfleig/systemd/tools/dbus_exporter.py", line 9, in extract_interfaces_xml
    proc = run(
  File "/usr/lib64/python3.9/subprocess.py", line 528, in run
    raise CalledProcessError(retcode, process.args,
subprocess.CalledProcessError: Command '[PosixPath('/home/tfleig/systemd/build/systemd'), '--bus-introspect', 'list']' died with <Signals.SIGABRT: 6>.
[4/5] Generating man/systemd.index.xml with a custom command
ninja: build stopped: subcommand failed.
"""

src/core/load-fragment.c

index e2a528a629fc2908a92ee741e6a1217381b1e050..6d38143bd7586a81b8072543f379ff849b70b710 100644 (file)
@@ -3909,7 +3909,7 @@ int config_parse_tasks_max(
                 void *userdata) {
 
         CGroupTasksMax *tasks_max = ASSERT_PTR(data);
-        const Unit *u = ASSERT_PTR(userdata);
+        const Unit *u = userdata;
         uint64_t v;
         int r;