From 592eb0df47093cc32e1b38d119dc55e0f0f71d50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Nussbaumer?= <rn@google.com>
Date: Wed, 30 May 2012 11:17:39 +0200
Subject: [PATCH] Fix GenericCurlConfig when pycurl is linked against nss
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Redhat links its pycurl against NSS/ so this check fails and therefore
makes ganeti-watcher unusable.
Even though this seems to fix the problem and works, further testing on
this might be needed.
Signed-off-by: RenΓ© Nussbaumer <rn@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/rapi/client.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/rapi/client.py b/lib/rapi/client.py
index 15e61f4a8..b5a4df530 100644
--- a/lib/rapi/client.py
+++ b/lib/rapi/client.py
@@ -256,6 +256,9 @@ def GenericCurlConfig(verbose=False, use_signal=False,
lcsslver = sslver.lower()
if lcsslver.startswith("openssl/"):
pass
+ elif lcsslver.startswith("nss/"):
+ # TODO: investigate compatibility beyond a simple test
+ pass
elif lcsslver.startswith("gnutls/"):
if capath:
raise Error("cURL linked against GnuTLS has no support for a"
--
GitLab