X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=caff%2Fcaff;h=42e95f0696784f8d186805064818b8197acf63c9;hb=ca33169bf90bb6fa58307a91d2044cae0e83a663;hp=f9bb72d90404f88805d17e13328ec408c3f892fa;hpb=a22fce97e4ae55320bd3e66ea305567f3c83db20;p=pgp-tools.git

diff --git a/caff/caff b/caff/caff
index f9bb72d..42e95f0 100755
--- a/caff/caff
+++ b/caff/caff
@@ -90,7 +90,7 @@ configuration file.
 
 Import keys from file. Can be supplied more than once.
 
-=item B<--keys-from-gnupg> I<file>
+=item B<--keys-from-gnupg>
 
 Try to import keys from your standard GnuPG keyrings.
 
@@ -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");