[Da-tools-commits] ./debian/userdir-ldap r439: Aha. Error is not some magic variable or exception, it's a normal string that

[Peter Palfrader]

------------------------------------------------------------
revno: 439
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Sat 2008-07-19 21:36:54 +0200
message:
  Aha.  Error is not some magic variable or exception, it's a normal string that
  needs defining when we use it.
modified:
  debian/changelog
  userdir_gpg.py
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-07-19 14:20:56 +0000
+++ b/debian/changelog	2008-07-19 19:36:54 +0000
@@ -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 at 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

=== modified file 'userdir_gpg.py'
--- a/userdir_gpg.py	2008-07-19 14:20:56 +0000
+++ b/userdir_gpg.py	2008-07-19 19:36:54 +0000
@@ -254,6 +254,7 @@
 # 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