[Pgp-tools-commit] r484 - in trunk: caff debian

[Thijs Kinkhorst]

Author: thijs
Date: 2011-11-01 18:54:31 +0000 (Tue, 01 Nov 2011)
New Revision: 484

Modified:
   trunk/caff/caff
   trunk/debian/changelog
Log:
Be more verbose on unexpected key ID (Closes: #645792).

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2011-11-01 18:51:00 UTC (rev 483)
+++ trunk/caff/caff	2011-11-01 18:54:31 UTC (rev 484)
@@ -375,7 +375,7 @@
 
 
 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 @@
 				$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");

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2011-11-01 18:51:00 UTC (rev 483)
+++ trunk/debian/changelog	2011-11-01 18:54:31 UTC (rev 484)
@@ -2,6 +2,7 @@
 
   [ 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 @@
     + Create the mail files in ~/.caff/keys even if mail is not sent
       (closes: #590666).
 
- -- Franck Joncourt <franck at debian.org>  Mon, 22 Nov 2010 21:44:10 +0100
+ -- Thijs Kinkhorst <thijs at debian.org>  Tue, 01 Nov 2011 19:54:10 +0100
 
 signing-party (1.1.3-1) unstable; urgency=low