Skip to content
Snippets Groups Projects
Commit 5c5711d4 authored by Simon McVittie's avatar Simon McVittie
Browse files

adverb: Don't "pile up" errors if we cannot exec generate-locales


We want to reinstate the old signal mask unconditionally, but we only
want to throw an error for it if we weren't already about to throw an
error.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent a7130674
No related branches found
No related tags found
1 merge request!148adverb: Don't "pile up" errors if we cannot exec generate-locales
Pipeline #4707 passed
...@@ -412,7 +412,7 @@ generate_locales (gchar **locpath_out, ...@@ -412,7 +412,7 @@ generate_locales (gchar **locpath_out,
&wait_status, &wait_status,
error); error);
if (pthread_sigmask (SIG_SETMASK, &old_mask, NULL) != 0) if (pthread_sigmask (SIG_SETMASK, &old_mask, NULL) != 0 && ret)
return glnx_throw_errno_prefix (error, "pthread_sigmask"); return glnx_throw_errno_prefix (error, "pthread_sigmask");
if (!ret) if (!ret)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment