# Copyright (c) 1999-2000 Jason Gunthorpe <jgg@debian.org>
# Copyright (c) 2004 Joey Schulze <joey@debian.org>
# Copyright (c) 2008, 2009, 2010 Peter Palfrader <peter@palfrader.org>
+# Copyright (c) 2010 Martin Zobel-Helas <zobel@debian.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
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
# Process options
AdminUser = pwd.getpwuid(os.getuid())[0];
-(options, arguments) = getopt.getopt(sys.argv[1:], "au:m:n")
+(options, arguments) = getopt.getopt(sys.argv[1:], "ahu:m:")
for (switch, val) in options:
if (switch == '-u'):
AdminUser = val
elif (switch == '-m'):
LoadOverride(val);
+ elif (switch == '-h'):
+ print "Usage: ud-gpgimport <options>"
+ print "Available options:"
+ print " -h Show this help"
+ print " -u=<user> Admin user (defaults to current username)"
+ print " -m=<file> Override file to use"
+ print " -a actually do changes, not dry-run"
+ sys.exit(0)
elif (switch == '-a'):
NoAct = 0;
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)
- if UID[1] != None:
+ if UID[1] is not None:
for x in UID[1]: print x;
print "MISSING " + fpr;
continue;
# Look for unmatched keys
for x in KeyMap.keys():
- if KeyMap[x][1] == 0 and not x in pgpkeys_extra:
+ if KeyMap[x][1] == 0 and x not in pgpkeys_extra:
print "key %s belonging to %s removed"%(x,KeyMap[x][0]);
if KeyCount.has_key(KeyMap[x][0]) :
KeyCount[KeyMap[x][0]] = KeyCount[KeyMap[x][0]] - 1