fixed init-script.

Package-Manager: portage-2.0.53_rc6

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 6fc71f037c0fc27ba5b4b4372e26fcc89144cee2..6b5e027523c835541cf3afb076e73bdd78c650eb 100644 (file)
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,9 @@
 # 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.59 2005/11/08 04:46:00 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.60 2005/11/08 10:45:24 sbriesen Exp $
+
+  08 Nov 2005; Stefan Briesenick <sbriesen@gentoo.org> files/dbus:
+  fixed init-script.
 
 *dbus-0.50-r1 (08 Nov 2005)
 

diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 2d7454f9713fd85854d3135f76503c97bfe00f9c..59459581459778f230a27fbe8017d3f05abb7383 100644 (file)
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,4 +1,4 @@
-MD5 d4220fcb7942650538b1f1bce7ec38b0 ChangeLog 8661
+MD5 d581d037cc738857b76db1250ee80e57 ChangeLog 8750
 MD5 fab22de6cb9a5cf7e0abedfe77c9b04a dbus-0.23-r3.ebuild 3246
 MD5 fedfd2a1281d8773038a8036a2a75ef8 dbus-0.23.2-r1.ebuild 3454
 MD5 321657dd580453465e0cab3102a92e98 dbus-0.23.2.ebuild 3242
@@ -8,7 +8,7 @@ MD5 f127ffa8cdc75cbd0befadcb16d08401 dbus-0.36.2.ebuild 3620
 MD5 36c0119912a6585c12c8ef05b9687074 dbus-0.50-r1.ebuild 3749
 MD5 0a1ae7c5d57aceed3246ab0627f0c356 dbus-0.50.ebuild 3767
 MD5 d14e59575f04e55d21a04907b6fd9f3c files/30-dbus 243
-MD5 41552c39bbbe0027bee798f296c1a3f4 files/dbus 946
+MD5 2a21cd128b106bc728a0566c13e727e3 files/dbus 938
 MD5 768e500cfda89809161576ea2080a7aa files/dbus-0.23-dbus_session_connect.patch 1185
 MD5 f3ab25d85c77b7f859d4d2cefc787aef files/dbus-0.23-fd_set.patch 293
 MD5 403b7724a698be1509916991e87224a4 files/dbus-0.23-pyexecdir.patch 1131

diff --git a/sys-apps/dbus/files/dbus b/sys-apps/dbus/files/dbus
index 4894e49442445edd857788ccc9dc3a312240c284..ea2814c47cda973fb4294e7a07743f768e5ee5e8 100644 (file)
--- 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.6 2005/11/08 04:46:00 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus,v 1.7 2005/11/08 10:45:24 sbriesen Exp $
 
 start() {
 
@@ -27,9 +27,9 @@ stop() {
        # This should vanish when baselayout-1.12.0 is marked stable.
        [[ -f /var/run/dbus.pid ]] && rm -f /var/run/dbus.pid
 
-   # Changes to the system dbus socket run file force us to take care of both
-   [[ -f /var/lib/dbus/system_bus_socket ]] && rm -rf /var/lib/dbus/system_bus_socket
-   [[ -f /var/run/dbus/system_bus_socket ]] && rm -rf /var/run/dbus/system_bus_socket
+       # Changes to the system dbus socket run file force us to take care of both
+       [[ -S /var/lib/dbus/system_bus_socket ]] && rm -f /var/lib/dbus/system_bus_socket
+       [[ -S /var/run/dbus/system_bus_socket ]] && rm -f /var/run/dbus/system_bus_socket
 
        return ${retval}