[Pgp-tools-commit] r58 - trunk/caff

[Christoph Berg]

Author: myon-guest
Date: 2005-06-08 11:17:02 +0000 (Wed, 08 Jun 2005)
New Revision: 58

Modified:
   trunk/caff/caff
Log:
remove stray debug output; strip 0x prefix from keyids

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2005-06-08 11:08:17 UTC (rev 57)
+++ trunk/caff/caff	2005-06-08 11:17:02 UTC (rev 58)
@@ -491,6 +491,7 @@
 	usage() unless scalar @ARGV >= 3;
 	shift @ARGV;
 	$USER = shift @ARGV;
+	$USER =~ s/^0x//i;
 	unless ($USER =~ /^[A-Za-z0-9]{8,8}([A-Za-z0-9]{8})?$/) {
 		print STDERR "-u $USER is not a keyid.\n";
 		usage();
@@ -498,6 +499,7 @@
 	$USER = uc($USER);
 };
 for my $keyid (@ARGV) {
+	$keyid =~ s/^0x//i;
 	unless ($keyid =~ /^[A-Za-z0-9]{8}([A-Za-z0-9]{8})?$/) {
 		print STDERR "$keyid is not a keyid.\n";
 		usage();
@@ -525,7 +527,6 @@
 		warn ("No data from gpg for list-key\n");
 		next;
 	};
-	print $stdout;
 	foreach my $keyid (@{$CONFIG{'keyid'}}) {
 		unless ($stdout =~ /^pub:(?:[^:]*:){3,3}$keyid:/m) {
 			info("Importing $keyid");