Fix issue with GnuPG keyserver test throwing the wrong exception

firstlookmedia · Mar 16, 2017 · 8bc2af3 · 8bc2af3
1 parent 7dcd605
commit 8bc2af3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/gpgsync/gnupg.py b/gpgsync/gnupg.py
@@ -122,7 +122,7 @@ def recv_key(self, keyserver, fp, use_proxy, proxy_host, proxy_port):
         args = ['--recv-keys', fp]
         out,err = self._gpg(args)
 
-        if b"No keyserver available" in err or b"gpgkeys: HTTP fetch error" in out:
+        if b"No keyserver available" in err or b"gpg: keyserver communications error: General error" in err or b"gpgkeys: HTTP fetch error" in out:
             raise InvalidKeyserver(keyserver)
 
         if b"not found on keyserver" in err or b"keyserver receive failed: No data" in err or b"no valid OpenPGP data found" in err: