From: weasel <weasel@b513b33f-fedd-0310-b452-c3deb5f4c849>
Date: Tue, 7 Mar 2006 23:00:39 +0000 (+0000)
Subject: Minor fix for pesky v3k keys
X-Git-Url: https://git.sthu.org/?a=commitdiff_plain;h=17fff4a5e66af8ce769b02eb94a4a06423adb322;p=pgp-tools.git

Minor fix for pesky v3k keys

git-svn-id: svn://svn.debian.org/pgp-tools/trunk@268 b513b33f-fedd-0310-b452-c3deb5f4c849
---

diff --git a/caff/caff b/caff/caff
index af8ae22..3dd62f1 100755
--- a/caff/caff
+++ b/caff/caff
@@ -1026,6 +1026,12 @@ if ($CONFIG{'no-download'}) {
 	if (scalar %local_keyids) {
 		notice ("Import failed for: ". (join ' ', keys %local_keyids)."." . ($had_v3_keys ? " (Or maybe it's one of those ugly v3 keys?)" :  ""));
 		exit 1 unless ask ("Some keys could not be imported - continue anyway?", 0);
+		if (scalar %local_keyids == 1) {
+			mywarn("Assuming ". (join ' ', keys %local_keyids)." is a fine keyid.");
+		} else {
+			mywarn("Assuming ". (join ' ', keys %local_keyids)." are fine keyids.");
+		};
+		push @keyids_ok, keys %local_keyids;
 	}
 };