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

[Christoph Berg]

Author: myon
Date: 2006-08-16 16:24:41 +0000 (Wed, 16 Aug 2006)
New Revision: 297

Modified:
   trunk/caff/caff
Log:
clean up keyid detection

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2006-08-16 11:44:38 UTC (rev 296)
+++ trunk/caff/caff	2006-08-16 16:24:41 UTC (rev 297)
@@ -908,11 +908,11 @@
 
 for my $keyid (@ARGV) {
 	$keyid =~ s/^0x//i;
-	unless ($keyid =~ /^([A-F0-9]{8}|[A-F0-9]{16}||[A-F0-9]{40})$/i) {
-		if ($keyid =~ /^[A-F0-9]{32}$/) {
-			info("Ignoring v3 fingerprint $keyid.  v3 keys are obsolete.");
-			next;
-		};
+	if ($keyid =~ /^[A-F0-9]{32}$/i) {
+		info("Ignoring v3 fingerprint $keyid.  v3 keys are obsolete.");
+		next;
+	};
+	if ($keyid !~ /^([A-F0-9]{8}|[A-F0-9]{16}|[A-F0-9]{40})$/i) {
 		print STDERR "$keyid is not a keyid.\n";
 		usage(\*STDERR, 1);
 	};