[libreoffice/f16] Resolves: rhbz#807316 don't complain that --nocrashreport is unknown
Caolán McNamara
caolanm at fedoraproject.org
Tue Mar 27 14:24:15 UTC 2012
commit c4e8338194a9d01d7e900e79bd0e4305a1cd317b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Mar 27 15:24:04 2012 +0100
Resolves: rhbz#807316 don't complain that --nocrashreport is unknown
...not-complain-about-soffice-command-line-o.patch | 3 ++-
libreoffice.spec | 1 +
2 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/0001-desktop-do-not-complain-about-soffice-command-line-o.patch b/0001-desktop-do-not-complain-about-soffice-command-line-o.patch
index 1832a34..552b2d3 100644
--- a/0001-desktop-do-not-complain-about-soffice-command-line-o.patch
+++ b/0001-desktop-do-not-complain-about-soffice-command-line-o.patch
@@ -17,7 +17,7 @@ diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs
index 5ae86ab..0bc6312 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
-@@ -306,10 +306,16 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
+@@ -306,10 +306,17 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
}
#if defined UNX
else
@@ -26,6 +26,7 @@ index 5ae86ab..0bc6312 100644
+ // primitive tools that /bin/sh offers, ignore them here
+ if (!oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("backtrace")) &&
+ !oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("strace")) &&
++ !oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("nocrashreport")) &&
+ !oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("valgrind")))
{
- printf("Unknown option %s\n",
diff --git a/libreoffice.spec b/libreoffice.spec
index eca34e1..1f1d5f7 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -2496,6 +2496,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
- Resolves: rhbz#789022 SwNodes: fix inconsistent outline check
- Resolves: rhbz#806663 SlideshowImpl can outlive SdModule
- Resolves: rhbz#807243 require correct version of hsqldb
+- Resolves: rhbz#807316 don't complain that --nocrashreport is unknown
* Tue Mar 06 2012 Caolán McNamara <caolanm at redhat.com> - 3.4.5.2-8
- Resolves: fdo#31966 do not create an empty slide when printing handouts
More information about the scm-commits
mailing list