X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=userdir_gpg.py;h=456833301e624c36afcbf9939d9220c13ab3faa3;hb=2324f9ecd1fb0ef9fa523903902695ff770b1517;hp=cf9cdbc72d999032d3938d913a42f6af3ca6cdbb;hpb=bfb0c6a2273f10ebffd6dfa15a45ae7f5671b467;p=mirror%2Fuserdir-ldap.git diff --git a/userdir_gpg.py b/userdir_gpg.py index cf9cdbc..4568333 100644 --- a/userdir_gpg.py +++ b/userdir_gpg.py @@ -52,6 +52,9 @@ CleanCutOff = 7*24*60*60; AgeCutOff = 4*24*60*60; FutureCutOff = 3*24*60*60; +def ClearKeyrings(): + del GPGKeyRings[:] + # Set the keyrings, the input is a list of keyrings def SetKeyrings(Rings): for x in Rings: @@ -423,7 +426,7 @@ def GPGCheckSig(Message): # A gpg failure is an automatic bad signature if Exit[1] != 0 and Why == None: GoodSig = 0; - Why = "GPG execution failed " + str(Exit[0]); + Why = "GPG execution returned non-zero exit status: " + str(Exit[1]); if GoodSig == 0 and (Why == None or len(Why) == 0): Why = "Checking Failed";