diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2005-03-11 21:21:09 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2005-03-11 21:21:09 +0000 |
| commit | e31931b35914308b81d97676ba016d381a57b5f1 (patch) | |
| tree | 6dc2b8a92c2b3a530a6e57fd226daf0ab9a83c83 /sys-apps/dbus | |
| parent | Version bump (diff) | |
| download | gentoo-2-e31931b35914308b81d97676ba016d381a57b5f1.tar.gz gentoo-2-e31931b35914308b81d97676ba016d381a57b5f1.tar.bz2 gentoo-2-e31931b35914308b81d97676ba016d381a57b5f1.zip | |
Fix rcscript to not clobber return of stop() due to existance of pidfile or not.
(Portage version: 2.0.51.19)
Diffstat (limited to 'sys-apps/dbus')
| -rw-r--r-- | sys-apps/dbus/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/dbus/files/dbus | 15 |
2 files changed, 16 insertions, 5 deletions
diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog index de36c13487d5..67cbd5c6e2bf 100644 --- a/sys-apps/dbus/ChangeLog +++ b/sys-apps/dbus/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/dbus # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.40 2005/03/11 03:22:27 latexer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.41 2005/03/11 21:21:09 azarah Exp $ + + 11 Mar 2005; Martin Schlemmer <azarah@gentoo.org> files/dbus: + Fix rcscript to not clobber return of stop() due to existance of pidfile or + not. 10 Mar 2005; Peter Johanson <latexer@gentoo.org> dbus-0.23-r3.ebuild, dbus-0.23.2-r1.ebuild, dbus-0.23.2.ebuild: diff --git a/sys-apps/dbus/files/dbus b/sys-apps/dbus/files/dbus index 4a176bf4583f..3d58004b8412 100644 --- a/sys-apps/dbus/files/dbus +++ b/sys-apps/dbus/files/dbus @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus,v 1.4 2004/08/17 17:41:58 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus,v 1.5 2005/03/11 21:21:09 azarah Exp $ start() { @@ -15,11 +15,18 @@ start() { stop() { + local retval + ebegin "Stopping D-BUS system messagebus" - start-stop-daemon --stop --pidfile /var/run/dbus.pid - rm /var/run/dbus.pid + start-stop-daemon --stop --pidfile /var/run/dbus.pid + retval=$? - eend $? + eend ${retval} + + # This should vanish when baselayout-1.12.0 is marked stable. + rm -f /var/run/dbus.pid + + return ${retval} } |