[Libreoffice-commits] .: solenv/bin

[Caolán McNamara]

 solenv/bin/build.pl |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 91d188bc800700e196b55e8702be70a79c10accb
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 19 16:10:03 2011 +0000

    Related: rhbz#670895 don't halt build if zenity crashes

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 103c055..47257c9 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -1719,6 +1719,12 @@ sub cancel_build {
 sub store_error {
     my ($pid, $error_code) = @_;
     return 0 if (!$error_code);
+
+    #we don't care if zenity itself crashes, e.g. rhbz#670895
+    if (zenity_enabled()) {
+        return 0 if ($zenity_pid == $pid);
+    }
+
     my $child_nick = $processes_hash{$pid};
     if ($ENV{GUI} eq 'WNT') {
         if (!defined $had_error{$child_nick}) {
@@ -2112,7 +2118,7 @@ sub zenity_enabled {
 sub zenity_open {
     if (zenity_enabled()) {
 	$SIG{PIPE} = 'IGNORE';
-        my $zenity_pid = open3($zenity_in, $zenity_out, $zenity_err,
+        $zenity_pid = open3($zenity_in, $zenity_out, $zenity_err,
                                "zenity --notification --listen");
     };
 };