From 3f150e12e7586a01d1e4f970a3edbbd99151bbdb Mon Sep 17 00:00:00 2001
From: Valentin Lorentz <progval@gmail.com>
Date: Tue, 29 Oct 2013 17:09:41 +0100
Subject: [PATCH] gpg: Disable use of incompatible library 'gnupg'.

---
 src/gpg.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/gpg.py b/src/gpg.py
index a72a73464..b22ed7773 100644
--- a/src/gpg.py
+++ b/src/gpg.py
@@ -40,6 +40,11 @@ except ImportError:
     # it is available. Otherwise, we just don't allow user auth through GPG.
     log.debug('Cannot import gnupg, using fallback.')
     gnupg = None
+try:
+    gnupg.GPG(gnupghome=None)
+except TypeError:
+    # This is the 'gnupg' library, not 'python-gnupg'.
+    gnupg = None
 
 available = (gnupg is not None)