projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
We don't use the LDAP object in these functions, so I don't see why we're passing...
[mirror/userdir-ldap.git]
/
userdir_gpg.py
diff --git
a/userdir_gpg.py
b/userdir_gpg.py
index
cf9cdbc
..
4568333
100644
(file)
--- 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;
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:
# 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;
# 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";
if GoodSig == 0 and (Why == None or len(Why) == 0):
Why = "Checking Failed";