[Pgp-tools-commit] r107 - trunk/caff

[Christoph Berg]

Author: myon-guest
Date: 2005-07-02 19:21:17 +0000 (Sat, 02 Jul 2005)
New Revision: 107

Modified:
   trunk/caff/caff
Log:
* catch IMPORTED when importing
* another note about v3 keys
* PS for the last commit:
  pass "save" to gpg to save the key automatically (this doesn't hurt when the key is not changed)


Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2005-07-02 19:00:07 UTC (rev 106)
+++ trunk/caff/caff	2005-07-02 19:21:17 UTC (rev 107)
@@ -781,14 +781,13 @@
 			$imported_key =       $3.$4 if $local_keyids{      $3.$4};
 			$imported_key =          $4 if $local_keyids{         $4};
 			unless ($imported_key) {
-			    warn("Imported unexpected key; got: $imported_key.\n");
+			    notice ("Imported unexpected key; got: $1$2$3$4. (This is normal for v3 keys.)\n");
 			    next;
 			};
 			debug ("Imported $imported_key");
 			delete $local_keyids{$imported_key};
 			unshift @keyids_ok, $imported_key;
-		} elsif ($line =~ /^\[GNUPG:\] NODATA 1$/) {
-		} elsif ($line =~ /^\[GNUPG:\] IMPORT_RES /) {
+		} elsif ($line =~ /^\[GNUPG:\] (NODATA|IMPORT_RES|IMPORTED) /) {
 		} else {
 			notice ("got unknown reply from gpg: $line");
 		}