diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-01-19 16:10:03 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-01-19 16:10:03 +0000 |
| commit | b0ae2ae486fa42ce68dd63d71d85b585d04dcd4e (patch) | |
| tree | 035fe60e371c394df7e32b2ed214579b4a42765d /solenv | |
| parent | Use ml64 for wntmscx (diff) | |
| download | core-b0ae2ae486fa42ce68dd63d71d85b585d04dcd4e.tar.gz core-b0ae2ae486fa42ce68dd63d71d85b585d04dcd4e.zip | |
Related: rhbz#670895 don't halt build if zenity crashes
Diffstat (limited to 'solenv')
| -rwxr-xr-x | solenv/bin/build.pl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index a64c3e12c31e..5e424dfd6252 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"); }; }; |