353/376: Don't abort if we get a signal while waiting for the pager

[Ludovic Courtès]

civodul pushed a commit to tag 1.8
in repository guix.

commit 5a2d45164899479cb3dfe94cb7659fd522163acc
Author: Eelco Dolstra <address@hidden>
Date:   Fri Dec 12 14:05:23 2014 +0100

    Don't abort if we get a signal while waiting for the pager
---
 src/libmain/shared.cc |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc
index 8d06455..7b50bfa 100644
--- a/src/libmain/shared.cc
+++ b/src/libmain/shared.cc
@@ -328,10 +328,14 @@ RunPager::RunPager()
 
 RunPager::~RunPager()
 {
-    if (pid != -1) {
-        std::cout.flush();
-        close(STDOUT_FILENO);
-        pid.wait(true);
+    try {
+        if (pid != -1) {
+            std::cout.flush();
+            close(STDOUT_FILENO);
+            pid.wait(true);
+        }
+    } catch (...) {
+        ignoreException();
     }
 }