Skip to content

Commit 8fe12f4

Browse files
YHNdnzjbluca
authored andcommitted
portable: do not use SYNTHETIC_ERRNO for sd_bus_error_set_errno()
The concept of synthetic errnos is about logging, which is irrelevant irt bus error and we don't do any special treatment in sd-bus for them, meaning the value propagated would be spurious. (cherry picked from commit 2f2058d) (cherry picked from commit 018c7fb) (cherry picked from commit 39c2b7f) (cherry picked from commit 06be1bf) (cherry picked from commit bddd7a1)
1 parent 8ce6b63 commit 8fe12f4

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/portable/portable.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ static int extract_image_and_extensions(
593593
if (r < 0)
594594
return r;
595595
if (isempty(id))
596-
return sd_bus_error_set_errnof(error, SYNTHETIC_ERRNO(ESTALE), "Image %s os-release metadata lacks the ID field", name_or_path);
596+
return sd_bus_error_set_errnof(error, ESTALE, "Image %s os-release metadata lacks the ID field", name_or_path);
597597

598598
if (prefixes) {
599599
valid_prefixes = strv_split(prefixes, WHITESPACE);
@@ -637,7 +637,7 @@ static int extract_image_and_extensions(
637637
if (validate_sysext) {
638638
r = extension_release_validate(ext->path, id, version_id, sysext_level, "portable", extension_release);
639639
if (r == 0)
640-
return sd_bus_error_set_errnof(error, SYNTHETIC_ERRNO(ESTALE), "Image %s extension-release metadata does not match the root's", ext->path);
640+
return sd_bus_error_set_errnof(error, ESTALE, "Image %s extension-release metadata does not match the root's", ext->path);
641641
if (r < 0)
642642
return sd_bus_error_set_errnof(error, r, "Failed to compare image %s extension-release metadata with the root's os-release: %m", ext->path);
643643
}

0 commit comments

Comments
 (0)