[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/0.9.8-1

[Guido Günther]

The following commit has been merged in the master branch:
commit 52e19b5a195e63c16c6f6b421a6303609ac99db0
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Dec 8 23:30:39 2011 +0100

    Drop remote_driver-don-t-fail-if-keepalive-check-fails.patch
    
    applied upstream.

diff --git a/debian/patches/remote_driver-don-t-fail-if-keepalive-check-fails.patch b/debian/patches/remote_driver-don-t-fail-if-keepalive-check-fails.patch
deleted file mode 100644
index 4b9bb56..0000000
--- a/debian/patches/remote_driver-don-t-fail-if-keepalive-check-fails.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Sun, 4 Dec 2011 15:26:23 +0100
-Subject: remote_driver: don't fail if keepalive check fails
-
-Otherwise connections to older libvirt abort with:
-
-$ virsh -c qemu+ssh://host.example.com/system list
-error: invalid connection pointer in virDrvSupportsFeature
-error: failed to connect to the hypervisor
-
-Tested against 0.8.3 and 0.9.8-rc2.
----
- src/remote/remote_driver.c |    4 +---
- 1 files changed, 1 insertions(+), 3 deletions(-)
-
-diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
-index 556c90c..1fb0eca 100644
---- a/src/remote/remote_driver.c
-+++ b/src/remote/remote_driver.c
-@@ -678,10 +678,8 @@ doRemoteOpen (virConnectPtr conn,
-         rc = call(conn, priv, 0, REMOTE_PROC_SUPPORTS_FEATURE,
-                   (xdrproc_t)xdr_remote_supports_feature_args, (char *) &args,
-                   (xdrproc_t)xdr_remote_supports_feature_ret, (char *) &ret);
--        if (rc == -1)
--            goto failed;
- 
--        if (ret.supported) {
-+        if (rc != -1 && ret.supported) {
-             priv->serverKeepAlive = true;
-         } else {
-             VIR_INFO("Disabling keepalive protocol since it is not supported"
diff --git a/debian/patches/series b/debian/patches/series
index bb01f7a..28c11bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,4 +9,3 @@ virsh-Initialize-library-before-calling-virResetLast.patch
 Disable-daemon-start-test.patch
 Disable-gnulib-s-test-nonplocking-pipe.sh.patch
 Disable-failing-virnetsockettest.patch
-remote_driver-don-t-fail-if-keepalive-check-fails.patch

-- 
Libvirt Debian packaging