[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, experimental, updated. debian/0.9.9-1-1-g97182f9

[Guido Günther]

The following commit has been merged in the experimental branch:
commit 97182f95d4d0b357d2915340e3d3e7242285d5b0
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sat Jan 14 21:35:05 2012 +0100

    Don't fail if we can't setup avahi.
    
    We'd need to make this a hard dependency otherwise.

diff --git a/debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch b/debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch
new file mode 100644
index 0000000..f6af824
--- /dev/null
+++ b/debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch
@@ -0,0 +1,24 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Sat, 14 Jan 2012 18:09:01 +0100
+Subject: Don't fail if we can't setup avahi
+
+---
+ src/rpc/virnetserver.c |    5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
+index f761e6b..ab6d112 100644
+--- a/src/rpc/virnetserver.c
++++ b/src/rpc/virnetserver.c
+@@ -695,9 +695,8 @@ void virNetServerRun(virNetServerPtr srv)
+     virNetServerLock(srv);
+ 
+ #if HAVE_AVAHI
+-    if (srv->mdns &&
+-        virNetServerMDNSStart(srv->mdns) < 0)
+-        goto cleanup;
++    if (srv->mdns)
++        virNetServerMDNSStart(srv->mdns);
+ #endif
+ 
+     if (srv->autoShutdownTimeout &&
diff --git a/debian/patches/series b/debian/patches/series
index 28c11bd..53c08fe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ virsh-Initialize-library-before-calling-virResetLast.patch
 Disable-daemon-start-test.patch
 Disable-gnulib-s-test-nonplocking-pipe.sh.patch
 Disable-failing-virnetsockettest.patch
+Don-t-fail-if-we-can-t-setup-avahi.patch

-- 
Libvirt Debian packaging