projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ud-generate: deal with users without loginShell
[mirror/userdir-ldap.git]
/
ud-gpgimport
diff --git
a/ud-gpgimport
b/ud-gpgimport
index
ee158cb
..
103f472
100755
(executable)
--- a/
ud-gpgimport
+++ b/
ud-gpgimport
@@
-95,8
+95,8
@@
def load_keys_from_gpg(keyrings):
continue
keys[fingerprint] = pgp_uid
continue
keys[fingerprint] = pgp_uid
- if Keys.close()
!=
None:
- raise
"Error","GPG failed"
+ if Keys.close()
is not
None:
+ raise
Exception("GPG failed")
return keys
return keys
@@
-177,9
+177,9
@@
for fpr in pgpkeys:
continue;
UID = GetUID(l,SplitEmail(pgp_uid),UnknownMap);
continue;
UID = GetUID(l,SplitEmail(pgp_uid),UnknownMap);
- if UID[0]
==
None:
+ if UID[0]
is
None:
print "Unassigned key in keyrings: %s, belonging to %s"%(fpr, pgp_uid)
print "Unassigned key in keyrings: %s, belonging to %s"%(fpr, pgp_uid)
- if UID[1]
!=
None:
+ if UID[1]
is not
None:
for x in UID[1]: print x;
print "MISSING " + fpr;
continue;
for x in UID[1]: print x;
print "MISSING " + fpr;
continue;