summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Briesenick <sbriesen@gentoo.org>2005-11-08 10:45:24 +0000
committerStefan Briesenick <sbriesen@gentoo.org>2005-11-08 10:45:24 +0000
commitf0de8f8793ae066c830aaf2dbe9e5471a9d9aa88 (patch)
treeba38fec3ebdda5a76e696761b055ccf6dbdc67a7 /sys-apps/dbus
parentversion bump (diff)
downloadgentoo-2-f0de8f8793ae066c830aaf2dbe9e5471a9d9aa88.tar.gz
gentoo-2-f0de8f8793ae066c830aaf2dbe9e5471a9d9aa88.tar.bz2
gentoo-2-f0de8f8793ae066c830aaf2dbe9e5471a9d9aa88.zip
fixed init-script.
(Portage version: 2.0.53_rc6)
Diffstat (limited to 'sys-apps/dbus')
-rw-r--r--sys-apps/dbus/ChangeLog5
-rw-r--r--sys-apps/dbus/Manifest2
-rw-r--r--sys-apps/dbus/files/dbus8
3 files changed, 9 insertions, 6 deletions
diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 6fc71f037c0f..6b5e027523c8 100644
--- 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 2d7454f9713f..69f31f044a22 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -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 06ad927948b45d54b489cb9e2ef733d9 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 4894e4944244..ea2814c47cda 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.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}