summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Yuan <me@yhndnzj.com>2024-11-13 17:45:53 +0100
committerMike Yuan <me@yhndnzj.com>2024-11-13 17:47:11 +0100
commit2f2058da0b88535cb3a95fc98e7b2f1ae4d35601 (patch)
treefb769637e8ae636a799d9828aff3bcbabe40eacf
parentsd-bus/bus-common-errors: reorder one pid1 error to group with others (diff)
downloadsystemd-2f2058da0b88535cb3a95fc98e7b2f1ae4d35601.tar.xz
systemd-2f2058da0b88535cb3a95fc98e7b2f1ae4d35601.zip
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.
Diffstat (limited to '')
-rw-r--r--src/portable/portable.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/portable/portable.c b/src/portable/portable.c
index 5476a86614..18a8060a9f 100644
--- a/src/portable/portable.c
+++ b/src/portable/portable.c
@@ -671,7 +671,7 @@ static int extract_image_and_extensions(
if (r < 0)
return r;
if (isempty(id))
- return sd_bus_error_set_errnof(error, SYNTHETIC_ERRNO(ESTALE), "Image %s os-release metadata lacks the ID field", name_or_path);
+ return sd_bus_error_set_errnof(error, ESTALE, "Image %s os-release metadata lacks the ID field", name_or_path);
if (prefixes) {
valid_prefixes = strv_split(prefixes, WHITESPACE);
@@ -715,7 +715,7 @@ static int extract_image_and_extensions(
r = extension_release_validate(ext->path, id, version_id, confext_level, "portable", extension_release, IMAGE_CONFEXT);
if (r == 0)
- return sd_bus_error_set_errnof(error, SYNTHETIC_ERRNO(ESTALE), "Image %s extension-release metadata does not match the root's", ext->path);
+ return sd_bus_error_set_errnof(error, ESTALE, "Image %s extension-release metadata does not match the root's", ext->path);
if (r < 0)
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);
}