[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, bpo-lenny, updated. debian/0.8.3-4-24-g0349e22

[Guido Günther]

The following commit has been merged in the bpo-lenny branch:
commit f23ec0c9efb2e1c5e9a59b49ad05b4de6b0a86c7
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Nov 16 14:19:00 2010 +0100

    Drop 0009-Don-t-fail-if-D-Bus-isn-t-running.patch
    
    fixed upstream.

diff --git a/debian/patches/0009-Don-t-fail-if-D-Bus-isn-t-running.patch b/debian/patches/0009-Don-t-fail-if-D-Bus-isn-t-running.patch
deleted file mode 100644
index 552fdb3..0000000
--- a/debian/patches/0009-Don-t-fail-if-D-Bus-isn-t-running.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Tue, 12 Oct 2010 17:26:22 +0200
-Subject: [PATCH] Don't fail if D-Bus isn't running
-
-we don't fail on hal, so we shouldn't fail on D-Bus either
----
- src/node_device/node_device_hal.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c
-index 0174794..a6a6e25 100644
---- a/src/node_device/node_device_hal.c
-+++ b/src/node_device/node_device_hal.c
-@@ -725,6 +725,10 @@ static int halDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED)
-     dbus_conn = dbus_bus_get(DBUS_BUS_SYSTEM, &err);
-     if (dbus_conn == NULL) {
-         VIR_ERROR0("dbus_bus_get failed");
-+        /* We don't want to show a fatal error here,
-+           otherwise entire libvirtd shuts down when
-+           D-Bus isn't running */
-+        ret = 0;
-         goto failure;
-     }
-     dbus_connection_set_exit_on_disconnect(dbus_conn, FALSE);
--- 
diff --git a/debian/patches/series b/debian/patches/series
index e292295..69a573f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,3 @@
 0007-Fix-block-statistics-with-newer-versions-of-Xen.patch
 0008-Disable-CHECKSUM-rule.patch
 0009-Don-t-fail-lxc-domain-start-when-memory-controller-s.patch
-0009-Don-t-fail-if-D-Bus-isn-t-running.patch

-- 
Libvirt Debian packaging