Hello community, here is the log from the commit of package libreoffice-converter for openSUSE:Factory checked in at 2012-02-16 14:58:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice-converter (Old) and /work/SRC/openSUSE:Factory/.libreoffice-converter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice-converter", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice-converter/libreoffice-converter.changes 2011-09-23 02:10:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libreoffice-converter.new/libreoffice-converter.changes 2012-02-16 14:58:11.000000000 +0100 @@ -1,0 +2,15 @@ +Mon Feb 13 18:31:27 UTC 2012 - [email protected] + +- kills all children and grandchildren not just last; although current + LO version has only one of each, future versions my have more than one + +------------------------------------------------------------------- +Mon Feb 13 09:13:23 UTC 2012 - [email protected] + +- only kills copies of lo that it started +- kills all children and grandchildren of lo that it started; it is necessary + because Debian debuild will hang until all such children exit +- give the listener lo program a fake home directory in /tmp; it is needed + because on Debian sbuild lo will fail because the HOME directory is read-only + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-converter.spec ++++++ --- /var/tmp/diff_new_pack.rLChOd/_old 2012-02-16 14:58:12.000000000 +0100 +++ /var/tmp/diff_new_pack.rLChOd/_new 2012-02-16 14:58:12.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libreoffice-converter # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -39,6 +39,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch + %description This package includes a simple script ooconvert that can be used to convert various document file formats on the commandline. It uses @@ -52,8 +53,10 @@ cp %{S:0} %{S:1} %{S:2} . %patch0 + %build + %install install -m 755 -d $RPM_BUILD_ROOT%_datadir/%ooo_home/program install -m 755 -d $RPM_BUILD_ROOT%_bindir @@ -65,9 +68,11 @@ ln -sf loconvert $RPM_BUILD_ROOT%_bindir/ooconvert echo ".so man1/loconvert.1" >| $RPM_BUILD_ROOT%_mandir/man1/ooconvert.1 + %clean rm -rf $RPM_BUILD_ROOT + %files %defattr(-,root,root) %dir %_datadir/%ooo_home @@ -76,4 +81,6 @@ %_bindir/* %_mandir/man1/* + + %changelog ++++++ loconvert ++++++ --- /var/tmp/diff_new_pack.rLChOd/_old 2012-02-16 14:58:12.000000000 +0100 +++ /var/tmp/diff_new_pack.rLChOd/_new 2012-02-16 14:58:12.000000000 +0100 @@ -107,18 +107,86 @@ fi # start the OOo -echo "Starting LibreOffice..." +echo "Launch LibreOffice..." RUNNING=`ps | grep soffice.bin | grep -v grep` [ -z "$RUNNING" ] || { echo "OOo is running, please close it first" ; exit 1 ; } -$ooo_home/program/soffice -accept="socket,port=8100;urp;" -norestore -nofirststartwizard -nologo -headless >/dev/null 2>&1 & +PID_HOLD=$(mktemp) + +#create fake home directory for use by the +#listner +#This is needed because debian sbuild +#provides an non writable home directory by +#default + +FAKE_HOME=$(mktemp -d) + + +( bash <(echo "echo "'$$'" >$PID_HOLD;export HOME=$FAKE_HOME;$ooo_home/program/soffice -accept="'"socket,port=8100;urp;"'" -norestore -nofirststartwizard -nologo -headless >/dev/null 2>&1 ") & ) >/dev/null >&1 + sleep 10 # run the tests -echo "Doing the conversion..." +echo "Do the conversion..." export PYTHONPATH="$ooo_home/basis-link/program" python $document_converter_py "$OOCONV_INPUT" "$OOCONV_OUTPUT" # kill the OOo -killall -9 soffice.bin +#killall -9 soffice.bin +PID_CHILDREN=$(mktemp) +PID_GRANDCHILDREN=$(mktemp) +for PCHILD in $(pgrep -P $(<$PID_HOLD) );do + echo $PCHILD >> $PID_CHILDREN + for PGRANDCHILDREN in $(pgrep -P $PCHILD);do + echo $PGRANDCHILDREN >> $PID_GRANDCHILDREN + done + +done + +echo "Terminate helper processes used by the converter..." +#echo 'ignore "terminated" and done messages.' + +for x in $(<$PID_GRANDCHILDREN) +do + kill $x >/dev/null 2>&1 +done + + + +for x in $(<$PID_CHILDREN) +do + kill $x >/dev/null 2>&1 +done + + + +for x in $(<$PID_HOLD) +do + kill $x >/dev/null 2>&1 +done + +sleep 2 + + + +for x in $(<$PID_GRANDCHILDREN) +do + kill -9 $x >/dev/null 2>&1 +done + + +for x in $(<$PID_CHILDREN) +do + kill -9 $x >/dev/null 2>&1 +done + + + +for x in $(<$PID_HOLD) +do + kill -9 $x >/dev/null 2>&1 +done + +rm $PID_HOLD $PID_CHILDREN $PID_GRANDCHILDREN +rm -r $FAKE_HOME -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
