Skip to content

Commit 39c2b7f

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)
1 parent 6e29d79 commit 39c2b7f

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
@@ -620,7 +620,7 @@ static int extract_image_and_extensions(
620620
if (r < 0)
621621
return r;
622622
if (isempty(id))
623-
return sd_bus_error_set_errnof(error, SYNTHETIC_ERRNO(ESTALE), "Image %s os-release metadata lacks the ID field", name_or_path);
623+
return sd_bus_error_set_errnof(error, ESTALE, "Image %s os-release metadata lacks the ID field", name_or_path);
624624

625625
if (prefixes) {
626626
valid_prefixes = strv_split(prefixes, WHITESPACE);
@@ -664,7 +664,7 @@ static int extract_image_and_extensions(
664664
r = extension_release_validate(ext->path, id, version_id, confext_level, "portable", extension_release, IMAGE_CONFEXT);
665665

666666
if (r == 0)
667-
return sd_bus_error_set_errnof(error, SYNTHETIC_ERRNO(ESTALE), "Image %s extension-release metadata does not match the root's", ext->path);
667+
return sd_bus_error_set_errnof(error, ESTALE, "Image %s extension-release metadata does not match the root's", ext->path);
668668
if (r < 0)
669669
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);
670670
}

0 commit comments

Comments
 (0)