[Pgp-tools-commit] r728 - trunk/gpg-key2latex

[Guilhem Moulin]

Author: guilhem-guest
Date: 2014-11-10 17:41:25 +0000 (Mon, 10 Nov 2014)
New Revision: 728

Modified:
   trunk/gpg-key2latex/gpg-key2latex
Log:
gpg-key2latex: Handle deprecated gpg output on the status FD.

Modified: trunk/gpg-key2latex/gpg-key2latex
===================================================================
--- trunk/gpg-key2latex/gpg-key2latex	2014-11-07 17:40:21 UTC (rev 727)
+++ trunk/gpg-key2latex/gpg-key2latex	2014-11-10 17:41:25 UTC (rev 728)
@@ -154,7 +154,7 @@
                         }
                         next;
                     }
-                    if (!/^(?:rvk|tru|spk|uat):/) { # revoke/revoker/trust/fpr
+                    if (!/^(?:rvk|tru|uat):/) { # revoke/revoker/trust/uat
                         warn "Unknown value: '$_'\n";
                     }
                 }
@@ -175,7 +175,7 @@
                         push @{$key{uats}}, {size => $2, revoked => $3 & 0x02};
                         next;
                     }
-                    if (!/^\[GNUPG:\] KEYEXPIRED \d+$/) {
+                    if (!/^\[GNUPG:\] (?:KEYEXPIRED \d+|SIGEXPIRED deprecated-use-keyexpired-instead)$/) {
                         warn "Unknown value: '$_'";
                     }
                 }