[ooo-build-commit] .: bin/piece

Petr Mladek pmladek at kemper.freedesktop.org
Thu May 20 07:51:53 PDT 2010


 bin/piece/post-inst-postprocess |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 333e83bf932155707f45840749f1c21e69b7b71a
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu May 20 16:50:19 2010 +0200

    Fix repeated postprocess installation
    
    * bin/piece/post-inst-postprocess: force removing of
      $DESTDIR$OO_INSTDIR/program/sofficerc

diff --git a/bin/piece/post-inst-postprocess b/bin/piece/post-inst-postprocess
index aa241b4..b132d29 100755
--- a/bin/piece/post-inst-postprocess
+++ b/bin/piece/post-inst-postprocess
@@ -29,7 +29,7 @@ export JVMFWK_CONFIGFILE=file://`pwd`/jvmfwk3rc
 # FIXME: it would be possible to generate this file by the installer, e.g. in bootstrap
 if test "$DISTRO" = "SUSE" || echo "$DISTRO" | grep -q "SUSE-11" ; then
     if diff -q $DESTDIR$OO_INSTDIR/program/sofficerc $OO_INSTDIR_SHARE/ooo-build/src/sofficerc-upstream ; then
-	rm $DESTDIR$OO_INSTDIR/program/sofficerc
+	rm -f $DESTDIR$OO_INSTDIR/program/sofficerc
 	ln -sf $OO_INSTDIR_SHARE/program/sofficerc $DESTDIR$OO_INSTDIR/program/sofficerc
     else
 	echo "Error: The file \"sofficerc\" has changed in the sources"


More information about the ooo-build-commit mailing list