X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=blobdiff_plain;f=ud-echelon;h=a58c0ec4d688e135adf9e45e642ca45f7a381b03;hp=0487d9432c7019559776f3c4236b91ed3539929d;hb=da220ff14d1cfc33e6606875a5260b8c73d00558;hpb=37b0b5875ff83d8e9a9e8ca918d42fc32b720f06

diff --git a/ud-echelon b/ud-echelon
index 0487d94..a58c0ec 100755
--- a/ud-echelon
+++ b/ud-echelon
@@ -12,7 +12,16 @@ Debug = None;
 # Try to extract a key fingerprint from a PGP siged message
 def TryGPG(Email):
    # Try to get a pgp text
-   Msg = GetClearSig(Email);
+   try:
+      Msg = GetClearSig(Email);
+   except:
+      # Log an exception.. but continue. This is to deal with 'sort of' 
+      # PGP-MIME things
+      S = "%s: %s -> %s\n" %(Now,MsgID,ErrMsg);
+      S = S + " %s: %s\n" %(sys.exc_type,sys.exc_value);
+      ErrLog.write(S);
+      return None;
+
    if string.find(Msg[0],"-----BEGIN PGP SIGNED MESSAGE-----") == -1:
       return None;