From fb74d49d4f338f293cea186f4d60a066c9b6f354 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 31 Jan 2010 13:57:10 +0100 Subject: [PATCH] ud-gpgimport: Get rid of "0x" when printing keyids/fingerprints. --- debian/changelog | 3 ++- ud-gpgimport | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 564bb83..5475c6f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,9 @@ userdir-ldap (0.3.7X) Xnstable; urgency=low using Res which was overwritten a bit later. Also make a new gpgcheck2 class that allows us to access the values of the gpg signature check in a saner way. + * ud-gpgimport: Get rid of "0x" when printing keyids/fingerprints. - -- Peter Palfrader Sun, 31 Jan 2010 10:12:35 +0100 + -- Peter Palfrader Sun, 31 Jan 2010 13:56:51 +0100 userdir-ldap (0.3.76) unstable; urgency=low diff --git a/ud-gpgimport b/ud-gpgimport index 9730ca4..866563c 100755 --- a/ud-gpgimport +++ b/ud-gpgimport @@ -3,7 +3,7 @@ # Copyright (c) 1999-2000 Jason Gunthorpe # Copyright (c) 2004 Joey Schulze -# Copyright (c) 2008, 2009 Peter Palfrader +# Copyright (c) 2008, 2009, 2010 Peter Palfrader # # 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 @@ -141,7 +141,7 @@ while(1): break; if SeenKeys.has_key(Split2[9]): - print "Dup key 0x",Split2[9],"belonging to",KeyMap[Split2[9]][0]; + print "Dup key ",Split2[9],"belonging to",KeyMap[Split2[9]][0]; continue; SeenKeys[Split2[9]] = None; @@ -156,13 +156,13 @@ while(1): print "None for",SplitEmail(Split[9]),"'%s'"%(Split[9]); if UID[1] != None: for x in UID[1]: print x; - print "MISSING 0x" + Split2[9]; + print "MISSING " + Split2[9]; continue; UID = UID[0] Rec = [(ldap.MOD_ADD,"keyFingerPrint",Split2[9])]; Dn = "uid=" + UID + "," + BaseDn; - print "Adding key 0x"+Split2[9],"to",UID; + print "Adding key "+Split2[9],"to",UID; if KeyCount.has_key(UID): KeyCount[UID] = KeyCount[UID] + 1; else: @@ -188,7 +188,7 @@ print Ignored,"keys already in the directory (ignored)"; # Look for unmatched keys for x in KeyMap.keys(): if KeyMap[x][1] == 0: - print "key 0x%s belonging to %s removed"%(x,KeyMap[x][0]); + 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 if KeyCount[KeyMap[x][0]] <= 0: -- 2.20.1