From 3fbfc621f26886fb9ed995628bb22eaf1de3ce16 Mon Sep 17 00:00:00 2001 From: Simon McVittie <smcv@collabora.com> Date: Fri, 19 Feb 2021 19:08:57 +0000 Subject: [PATCH] runtime: Avoid "piling up" errors _srt_resolve_in_sysroot raises a GError, so it's a bug to set the GError again. Just put an explanatory prefix on the error we already had. Signed-off-by: Simon McVittie <smcv@collabora.com> --- pressure-vessel/runtime.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pressure-vessel/runtime.c b/pressure-vessel/runtime.c index 9ed820fd9..a5bb64e4e 100644 --- a/pressure-vessel/runtime.c +++ b/pressure-vessel/runtime.c @@ -2466,9 +2466,11 @@ pv_runtime_take_ld_so_from_provider (PvRuntime *self, &ld_so_relative_to_provider, error); if (path_fd < 0) - return glnx_throw_errno_prefix (error, - "Unable to determine provider path to %s", - arch->ld_so); + { + g_prefix_error (error, "Unable to determine provider path to %s: ", + arch->ld_so); + return FALSE; + } ld_so_in_provider = g_build_filename (self->provider_in_host_namespace, ld_so_relative_to_provider, NULL); -- GitLab