Skip to content

Commit bddd7a1

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)
1 parent 57778c6 commit bddd7a1

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
@@ -595,7 +595,7 @@ static int extract_image_and_extensions(
595595
if (r < 0)
596596
return r;
597597
if (isempty(id))
598-
return sd_bus_error_set_errnof(error, SYNTHETIC_ERRNO(ESTALE), "Image %s os-release metadata lacks the ID field", name_or_path);
598+
return sd_bus_error_set_errnof(error, ESTALE, "Image %s os-release metadata lacks the ID field", name_or_path);
599599

600600
if (prefixes) {
601601
valid_prefixes = strv_split(prefixes, WHITESPACE);
@@ -639,7 +639,7 @@ static int extract_image_and_extensions(
639639
if (validate_sysext) {
640640
r = extension_release_validate(ext->path, id, version_id, sysext_level, "portable", extension_release);
641641
if (r == 0)
642-
return sd_bus_error_set_errnof(error, SYNTHETIC_ERRNO(ESTALE), "Image %s extension-release metadata does not match the root's", ext->path);
642+
return sd_bus_error_set_errnof(error, ESTALE, "Image %s extension-release metadata does not match the root's", ext->path);
643643
if (r < 0)
644644
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);
645645
}

0 commit comments

Comments
 (0)