From 7a00472067403ebe1cfbedbfabfde03cc19c9c34 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 13 Jan 2012 09:28:16 +0100
Subject: Better fix for the valgrind.log problem.

Only redirect to valgrind.log if --valgrind but not $VALGRIND is given.
---
 desktop/scripts/soffice.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index 1ae4fb71231e..4d140512338a 100755
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -151,6 +151,12 @@ if [ -n "$GDBTRACECHECK" ] ; then
     exec $GDBTRACECHECK "$sd_prog/soffice.bin" "$@"
 fi
 
+# valgrind --log-file=valgrind.log does not work well with --trace-children=yes
+if [ -n "$VALGRINDCHECK" -a -z "$VALGRIND" ] ; then
+    echo "redirecting the standard and the error output to valgrind.log"
+    exec &>valgrind.log
+fi
+
 # do not pass the request for command line help to oosplash
 if test "$#" -eq 1; then
     case "$1" in
-- 
cgit