diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 02:19:38 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 02:19:38 +0000 |
| commit | 9aec250ec2362c12c8e6be62ab21b8269bbb4c65 (patch) | |
| tree | be3fb598e4ba731ca2e02861dad906f61823cdd2 /src/shared/install.c | |
| parent | Adding debian version 252.23-1~deb12u1. (diff) | |
| download | systemd-9aec250ec2362c12c8e6be62ab21b8269bbb4c65.tar.xz systemd-9aec250ec2362c12c8e6be62ab21b8269bbb4c65.zip | |
Merging upstream version 252.25.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/shared/install.c')
| -rw-r--r-- | src/shared/install.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/shared/install.c b/src/shared/install.c index 84d29dc..af3e8a3 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -342,9 +342,12 @@ void install_changes_dump(int r, const char *verb, const InstallChange *changes, assert(verb || r >= 0); for (size_t i = 0; i < n_changes; i++) { - if (changes[i].type < 0) - assert(verb); assert(changes[i].path); + /* This tries to tell the compiler that it's safe to use 'verb' in a string format if there + * was an error, but the compiler doesn't care and fails anyway, so strna(verb) is used + * too. */ + assert(verb || changes[i].type >= 0); + verb = strna(verb); /* When making changes here, make sure to also change install_error() in dbus-manager.c. */ |