From 5c5711d400af8aa22002aaee5437e99a08950588 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Mon, 5 Oct 2020 19:17:41 +0100
Subject: [PATCH] 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: Simon McVittie <smcv@collabora.com>
---
 pressure-vessel/adverb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pressure-vessel/adverb.c b/pressure-vessel/adverb.c
index 7a1e7a201..f41541122 100644
--- a/pressure-vessel/adverb.c
+++ b/pressure-vessel/adverb.c
@@ -412,7 +412,7 @@ generate_locales (gchar **locpath_out,
                       &wait_status,
                       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");
 
   if (!ret)
-- 
GitLab