Aha. Error is not some magic variable or exception, it's a normal string that

needs defining when we use it.

diff --git a/debian/changelog b/debian/changelog
index 0a103f5..310ee36 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+userdir-ldap (0.3.36) unstable; urgency=low
+
+  * Aha.  Error is not some magic variable or exception, it's a
+    normal string that needs defining when we use it.
+
+ -- Peter Palfrader <weasel@debian.org>  Sat, 19 Jul 2008 21:35:39 +0200
+
 userdir-ldap (0.3.35) unstable; urgency=low
 
   * Check if a key has encryption capabilities and fail saying so when

diff --git a/userdir_gpg.py b/userdir_gpg.py
index 1140d44..cf9cdbc 100644 (file)
--- a/userdir_gpg.py
+++ b/userdir_gpg.py
@@ -254,6 +254,7 @@ def GPGWriteFilter(Program,Options,Message):
 # It is best if the recipient is specified using the hex key fingerprint
 # of the target, ie 0x64BE1319CCF6D393BF87FF9358A6D4EE
 def GPGEncrypt(Message,To,PGP2):
+   Error = "KeyringError"
    # Encrypt using the PGP5 block encoding and with the PGP5 option set.
    # This will handle either RSA or DSA/DH asymetric keys.
    # In PGP2 compatible mode IDEA and rfc1991 encoding are used so that