projects
/
pgp-tools.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Be more verbose on unexpected key ID (Closes: #645792).
[pgp-tools.git]
/
caff
/
caff
diff --git
a/caff/caff
b/caff/caff
index f9bb72d90404f88805d17e13328ec408c3f892fa..6e987a4421878a76a7d7413a48006ed872082b26 100755
(executable)
--- a/
caff/caff
+++ b/
caff/caff
@@
-375,7
+375,7
@@
sub trace2($) {
sub generate_config() {
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;
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) {
$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\n
Are you trying to work on a subkey?
");
next;
};
debug ("Imported $imported_key for $speced_key");
next;
};
debug ("Imported $imported_key for $speced_key");