./packages/openofficeorg/3.1.1/unstable r1811: add missing .lock to actually check for the extistence of the lockfile and not for the profile dir...
------------------------------------------------------------
revno: 1811
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Tue 2010-01-12 23:29:42 +0100
message:
add missing .lock to actually check for the extistence of the lockfile and not for the profile dir...
modified:
changelog
shell-lib-components.sh
shell-lib-extensions.sh
=== modified file 'changelog'
--- a/changelog 2010-01-07 19:49:20 +0000
+++ b/changelog 2010-01-12 22:29:42 +0000
@@ -1,4 +1,4 @@
-openoffice.org (1:3.1.1-13) UNRELEASED; urgency=medium
+openoffice.org (1:3.1.1-13) unstable; urgency=medium
* ooo-build:
- switch to own debian-3-1-1 branch
@@ -11,8 +11,11 @@
(gcc-defaults is blocked)
- per request from the security team: use internal mysqlcppconn for
all archs (consistency), instead of only for i386
+ * debian/shell-lib-{extensions,components}.sh: add missing .lock to actually
+ check for the extistence of the lockfile and not for the profile dir, thanks
+ Chris Cheney
- -- Rene Engelhard <rene@debian.org> Thu, 07 Jan 2010 20:45:52 +0100
+ -- Rene Engelhard <rene@rene-engelhard.de> Tue, 12 Jan 2010 23:25:59 +0100
openoffice.org (1:3.1.1-12) unstable; urgency=medium
=== modified file 'shell-lib-components.sh'
--- a/shell-lib-components.sh 2009-10-17 11:14:59 +0000
+++ b/shell-lib-components.sh 2010-01-12 22:29:42 +0000
@@ -1,6 +1,6 @@
check_for_running_ooo() {
if [ -e /usr/lib/openoffice/program/bootstraprc ]; then
- LOCKFILE=`grep UserInstallation /usr/lib/openoffice/program/bootstraprc | cut -d= -f2 | sed -e 's,SYSUSERCONFIG,HOME,'`
+ 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
=== modified file 'shell-lib-extensions.sh'
--- a/shell-lib-extensions.sh 2009-10-17 11:14:59 +0000
+++ b/shell-lib-extensions.sh 2010-01-12 22:29:42 +0000
@@ -1,6 +1,6 @@
check_for_running_ooo() {
if [ -e /usr/lib/openoffice/program/bootstraprc ]; then
- LOCKFILE=`grep UserInstallation /usr/lib/openoffice/program/bootstraprc | cut -d= -f2 | sed -e 's,SYSUSERCONFIG,HOME,'`
+ 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
Reply to: