------------------------------------------------------------
revno: 1820
committer: Rene Engelhard <[email protected]>
branch nick: unstable
timestamp: Wed 2010-01-20 23:56:05 +0100
message:
echo error for running OOo to stderr when DEBIAN_FRONTEND is noninteractive
modified:
changelog
shell-lib-components.sh
shell-lib-extensions.sh
=== modified file 'changelog'
--- a/changelog 2010-01-18 02:04:26 +0000
+++ b/changelog 2010-01-20 22:56:05 +0000
@@ -5,8 +5,11 @@
dh_md5sums
- build without VERBOSE=true (normal) mode on all buildds now in a try
to mitigate buildd log size
+ * debian/shell-lib-{extensions,components}.sh: add echos instead of debconf
+ message on DEBIAN_FRONTEND = noninteractive so that people in that case
also
+ know what goes on
- -- Rene Engelhard <[email protected]> Mon, 18 Jan 2010 03:03:37 +0100
+ -- Rene Engelhard <[email protected]> Tue, 19 Jan 2010 21:50:23 +0100
openoffice.org (1:3.1.1-14) unstable; urgency=medium
=== modified file 'shell-lib-components.sh'
--- a/shell-lib-components.sh 2010-01-12 22:31:01 +0000
+++ b/shell-lib-components.sh 2010-01-20 22:56:05 +0000
@@ -3,12 +3,26 @@
LOCKFILE="`grep UserInstallation
/usr/lib/openoffice/program/bootstraprc | cut -d= -f2 | sed -e
's,SYSUSERCONFIG,HOME,'`/.lock"
PID=`pgrep soffice.bin | head -n 1`
if [ -n "$PID" ] || [ -e "$LOCKFILE" ]; then
- db_input high openoffice.org/running
- db_go
- # try again in case OOo got closed before hitting OK
- PID=`pgrep soffice.bin | head -n 1`
- if [ -n "$PID" ] || [ -e "$LOCKFILE" ]; then
- exit 1
+ if [ "$DEBIAN_FRONTEND" = "noninteractive" ]; then
+ echo "OpenOffice.org running!" >&2
+ echo "" >&2
+ echo -n "OpenOffice.org is running right now
with pid " >&2
+ echo -n "$PID." >&2
+ echo -n " This can cause problems\n" >&2
+ echo "with (de-)registration of components and
extensions" >&2
+ echo "Thus this package will fail to install"
>&2
+ echo "You should close all running instances of
OpenOffice.org (including" >&2
+ echo "any currently running Quickstarter)
before proceeding with the package" >&2
+ echo "upgrade." >&2
+ exit 1
+ else
+ db_input high openoffice.org/running
+ db_go
+ # try again in case OOo got closed before
hitting OK
+ PID=`pgrep soffice.bin | head -n 1`
+ if [ -n "$PID" ] || [ -e "$LOCKFILE" ]; then
+ exit 1
+ fi
fi
fi
fi
=== modified file 'shell-lib-extensions.sh'
--- a/shell-lib-extensions.sh 2010-01-12 22:31:01 +0000
+++ b/shell-lib-extensions.sh 2010-01-20 22:56:05 +0000
@@ -3,12 +3,26 @@
LOCKFILE="`grep UserInstallation
/usr/lib/openoffice/program/bootstraprc | cut -d= -f2 | sed -e
's,SYSUSERCONFIG,HOME,'`/.lock"
PID=`pgrep soffice.bin | head -n 1`
if [ -n "$PID" ] || [ -e "$LOCKFILE" ]; then
- db_input high openoffice.org/running
- db_go
- # try again in case OOo got closed before hitting OK
- PID=`pgrep soffice.bin | head -n 1`
- if [ -n "$PID" ] || [ -e "$LOCKFILE" ]; then
- exit 1
+ if [ "$DEBIAN_FRONTEND" = "noninteractive" ]; then
+ echo "OpenOffice.org running!" >&2
+ echo "" >&2
+ echo -n "OpenOffice.org is running right now
with pid " >&2
+ echo -n "$PID." >&2
+ echo -n " This can cause problems\n" >&2
+ echo "with (de-)registration of components and
extensions" >&2
+ echo "Thus this package will fail to install"
>&2
+ echo "You should close all running instances of
OpenOffice.org (including" >&2
+ echo "any currently running Quickstarter)
before proceeding with the package" >&2
+ echo "upgrade." >&2
+ exit 1
+ else
+ db_input high openoffice.org/running
+ db_go
+ # try again in case OOo got closed before
hitting OK
+ PID=`pgrep soffice.bin | head -n 1`
+ if [ -n "$PID" ] || [ -e "$LOCKFILE" ]; then
+ exit 1
+ fi
fi
fi
fi
