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

[Guido Günther]

The following commit has been merged in the experimental branch:
commit a9b77e5cfdc9755276305e771515a2240d22286e
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Jul 26 12:05:16 2011 +0200

    Drop Catch-dnsmasq-start-failures.patch
    
    applied upstream

diff --git a/debian/patches/Catch-dnsmasq-start-failures.patch b/debian/patches/Catch-dnsmasq-start-failures.patch
deleted file mode 100644
index dc86fbe..0000000
--- a/debian/patches/Catch-dnsmasq-start-failures.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Sat, 23 Jul 2011 23:24:21 +0200
-Subject: Catch dnsmasq start failures
-
-While we checked the return value we didn't maks sure ret != 0 which
-resulted in dnsmasq errors being ignored.
----
- src/network/bridge_driver.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
-index 660dd65..7cedbfd 100644
---- a/src/network/bridge_driver.c
-+++ b/src/network/bridge_driver.c
-@@ -732,8 +732,10 @@ networkStartDhcpDaemon(virNetworkObjPtr network)
-     if (ret < 0)
-         goto cleanup;
- 
--    if (virCommandRun(cmd, NULL) < 0)
-+    ret = virCommandRun(cmd, NULL);
-+    if (ret < 0) {
-         goto cleanup;
-+    }
- 
-     /*
-      * There really is no race here - when dnsmasq daemonizes, its
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 9958f75..fbeb7b0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,4 +9,3 @@ Disable-daemon-start-test.patch
 Disable-gnulib-s-test-nonplocking-pipe.sh.patch
 Autodetect-if-the-remote-nc-command-supports-the-q-o.patch
 Disable-failing-virnetsockettest.patch
-Catch-dnsmasq-start-failures.patch

-- 
Libvirt Debian packaging