From cb738997f3c4ba53c1b30b8845f51696fc4816d0 Mon Sep 17 00:00:00 2001 From: thijs Date: Tue, 1 Nov 2011 18:54:31 +0000 Subject: [PATCH] Be more verbose on unexpected key ID (Closes: #645792). git-svn-id: svn://svn.debian.org/pgp-tools/trunk@484 b513b33f-fedd-0310-b452-c3deb5f4c849 --- caff/caff | 4 ++-- debian/changelog | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/caff/caff b/caff/caff index f9bb72d..6e987a4 100755 --- a/caff/caff +++ b/caff/caff @@ -375,7 +375,7 @@ sub trace2($) { sub generate_config() { - notice("Error: \$LOGNAME is not set.\n") unless defined $ENV{'LOGNAME'}; + notice("Error: \$LOGNAME is not set.") unless defined $ENV{'LOGNAME'}; my $gecos = defined $ENV{'LOGNAME'} ? (getpwnam($ENV{LOGNAME}))[6] : undef; my $email; my @keys; @@ -1185,7 +1185,7 @@ if ($CONFIG{'no-download'}) { $speced_key = $spec if $local_keyids{$spec}; }; unless ($speced_key) { - notice ("Imported unexpected key; got: $imported_key\n"); + notice ("Imported unexpected key; got: $imported_key\nAre you trying to work on a subkey?"); next; }; debug ("Imported $imported_key for $speced_key"); diff --git a/debian/changelog b/debian/changelog index beeef55..f28ff88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ signing-party (1.1.4-1) UNRELEASED; urgency=low [ Thijs Kinkhorst ] * Correct path of ~/.caffrc in informational messages (Closes: #582603). + * Be more verbose on unexpected key ID (Closes: #645792). [ Franck Joncourt ] * Debian package: @@ -40,7 +41,7 @@ signing-party (1.1.4-1) UNRELEASED; urgency=low + Create the mail files in ~/.caff/keys even if mail is not sent (closes: #590666). - -- Franck Joncourt Mon, 22 Nov 2010 21:44:10 +0100 + -- Thijs Kinkhorst Tue, 01 Nov 2011 19:54:10 +0100 signing-party (1.1.3-1) unstable; urgency=low -- 2.30.2