------------------------------------------------------------
revno: 1844
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Sat 2010-03-06 19:12:32 +0100
message:
debian/shell-lib-extensions.sh: handle non-existant basis-link
modified:
changelog
shell-lib-extensions.sh
=== modified file 'changelog'
--- a/changelog 2010-03-06 10:58:21 +0000
+++ b/changelog 2010-03-06 18:12:32 +0000
@@ -1,3 +1,10 @@
+openoffice.org (1:3.2.0-5) UNRELEASED; urgency=low
+
+ * debian/shell-lib-extensions.sh: handle non-existant basis-link
+ (closes: #561498)
+
+ -- Rene Engelhard <r...@debian.org> Sat, 06 Mar 2010 15:45:28 +0100
+
openoffice.org (1:3.2.0-4) unstable; urgency=low
* debian/patches/update-postgresql-sdbc-to-0.7.6a.diff:
=== modified file 'shell-lib-extensions.sh'
--- a/shell-lib-extensions.sh 2010-02-15 10:42:03 +0000
+++ b/shell-lib-extensions.sh 2010-03-06 18:12:32 +0000
@@ -53,10 +53,14 @@
if /usr/lib/openoffice/program/unopkg list --shared $1 >/dev/null; then
INSTDIR=`mktemp -d`
export PYTHONPATH="/@OOBASISDIR@/program"
- basis=`readlink /usr/lib/openoffice/basis-link`
+ if [ -L /usr/lib/openoffice/basis-link ]; then
+ d=/var/lib/openoffice/`readlink /usr/lib/openoffice/basis-link`/
+ else
+ d=/usr/lib/openoffice
+ fi
/usr/lib/openoffice/program/unopkg remove -v --shared $1 \
"-env:UserInstallation=file://$INSTDIR" \
-
"-env:UNO_JAVA_JFW_INSTALL_DATA=file:///var/lib/openoffice/$basis/share/config/javasettingsunopkginstall.xml"
\
+
"-env:UNO_JAVA_JFW_INSTALL_DATA=file://$d/share/config/javasettingsunopkginstall.xml"
\
"-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
if [ -n $INSTDIR ]; then rm -rf $INSTDIR; fi
flush_unopkg_cache
@@ -69,10 +73,14 @@
check_for_running_ooo
INSTDIR=`mktemp -d`
export PYTHONPATH="/@OOBASISDIR@/program"
- basis=`readlink /usr/lib/openoffice/basis-link`
+ if [ -L /usr/lib/openoffice/basis-link ]; then
+ d=/var/lib/openoffice/`readlink /usr/lib/openoffice/basis-link`/
+ else
+ d=/usr/lib/openoffice
+ fi
/usr/lib/openoffice/program/unopkg add -v --shared $1 \
"-env:UserInstallation=file:///$INSTDIR" \
-
"-env:UNO_JAVA_JFW_INSTALL_DATA=file:///var/lib/openoffice/$basis/share/config/javasettingsunopkginstall.xml"
\
+
"-env:UNO_JAVA_JFW_INSTALL_DATA=file://$d/share/config/javasettingsunopkginstall.xml"
\
"-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
if [ -n $INSTDIR ]; then rm -rf $INSTDIR; fi
handle_soffice_listeners start
