* userdir-ldap.conf: add keyring.pgp to default add_keyrings.
* userdir_gpg.py: add a ClearKeyrings().
+ * ud-gpgimport: work on add_keyrings if no keyrings are given on the
+ command line.
- -- Peter Palfrader <weasel@debian.org> Mon, 06 Apr 2009 01:34:39 +0200
+ -- Peter Palfrader <weasel@debian.org> Mon, 06 Apr 2009 01:35:12 +0200
userdir-ldap (0.3.63) unstable; urgency=low
LoadOverride(val);
elif (switch == '-a'):
NoAct = 0;
-if len(arguments) == 0:
- print "Give some keyrings to probe";
- sys.exit(0);
+
# Main program starts here
print;
# Popen GPG with the correct magic special options
-Args = [GPGPath] + GPGBasicOptions;
+ClearKeyrings()
+if len(arguments) == 0:
+ print "Using default keyrings: %s"%ConfModule.add_keyrings;
+ SetKeyrings(ConfModule.add_keyrings.split(":"))
for x in arguments:
- Args.append("--keyring");
if x.find("/") == -1:
- Args.append("./"+x);
- else:
- Args.append(x);
-Args = Args + GPGSearchOptions + [" 2> /dev/null"]
+ x= "./"+x
+ SetKeyrings( [x] )
+
+Args = [GPGPath] + GPGBasicOptions + GPGKeyRings + GPGSearchOptions + [" 2> /dev/null"]
Keys = os.popen(" ".join(Args),"r");
# Loop over the GPG key file