abort on XIOError doesn't help us

f41
Caolán McNamara 14 years ago
parent 418c808627
commit f4e6130af3

@ -0,0 +1,27 @@
From 72244e6e6035ffc211ea7a4fce9aa96de8bc1f76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Wed, 3 Nov 2010 10:16:06 +0000
Subject: [PATCH] abort doesn't gain us anything here.
abort doesn't gain us anything here except to force abrt automatic bugreports kick
in, and XIOErrors can't be worked around
---
vcl/unx/source/plugadapt/salplug.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/vcl/unx/source/plugadapt/salplug.cxx b/vcl/unx/source/plugadapt/salplug.cxx
index 54f9752..ba6bf4a 100644
--- a/vcl/unx/source/plugadapt/salplug.cxx
+++ b/vcl/unx/source/plugadapt/salplug.cxx
@@ -284,7 +284,7 @@ void SalAbort( const XubString& rErrorText )
std::fprintf( stderr, "Application Error" );
else
std::fprintf( stderr, "%s", ByteString( rErrorText, gsl_getSystemTextEncoding() ).GetBuffer() );
- abort();
+ exit(-1);
}
const OUString& SalGetDesktopEnvironment()
--
1.7.3.1

@ -102,6 +102,7 @@ Patch15: openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch
Patch16: libreoffice-buildfix.patch Patch16: libreoffice-buildfix.patch
Patch17: libreoffice-xdg632229.gnomeshell.patch Patch17: libreoffice-xdg632229.gnomeshell.patch
Patch18: 0001-strcpy-cannot-be-used-with-overlapping-src-and-dest.patch Patch18: 0001-strcpy-cannot-be-used-with-overlapping-src-and-dest.patch
Patch19: 0001-abort-doesn-t-gain-us-anything-here.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir} %define instdir %{_libdir}
@ -717,6 +718,7 @@ cp -p %{SOURCE20} external/unowinreg/unowinreg.dll
%patch16 -p1 -b .libreoffice-buildfix.patch %patch16 -p1 -b .libreoffice-buildfix.patch
%patch17 -p0 -b .xdg632229.gnomeshell.patch %patch17 -p0 -b .xdg632229.gnomeshell.patch
%patch18 -p1 -b .strcpy-cannot-be-used-with-overlapping-src-and-dest %patch18 -p1 -b .strcpy-cannot-be-used-with-overlapping-src-and-dest
%patch19 -p1 -b .abort-doesn-t-gain-us-anything-here.patch
%build %build
echo build start time is `date`, diskspace: `df -h . | tail -n 1` echo build start time is `date`, diskspace: `df -h . | tail -n 1`

Loading…
Cancel
Save