[Pgp-tools-commit] r829 - in trunk: debian gpg-key2latex

[Guilhem Moulin]

Author: guilhem-guest
Date: 2016-02-02 18:04:49 +0000 (Tue, 02 Feb 2016)
New Revision: 829

Modified:
   trunk/debian/changelog
   trunk/gpg-key2latex/gpg-key2latex
Log:
Enclose (sub)key capabilities in square brackets.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2016-02-02 18:04:44 UTC (rev 828)
+++ trunk/debian/changelog	2016-02-02 18:04:49 UTC (rev 829)
@@ -13,6 +13,8 @@
     + Don't show capabilities of the entire key when --show-subkeys is set.
       (Instead, the capabilities of the master key and each subkey are shown
       independently in uppercase.)
+    + Enclose (sub)key capabilities in square brackets, to match GnuPG 2.1.11+'s
+      output.
 
  -- Guilhem Moulin <guilhem at guilhem.org>  Tue, 02 Feb 2016 14:31:32 +0100
 

Modified: trunk/gpg-key2latex/gpg-key2latex
===================================================================
--- trunk/gpg-key2latex/gpg-key2latex	2016-02-02 18:04:44 UTC (rev 828)
+++ trunk/gpg-key2latex/gpg-key2latex	2016-02-02 18:04:49 UTC (rev 829)
@@ -273,7 +273,7 @@
     $str .= strftime '%Y-%m-%d', localtime($key->{creation});
     $str .= ' [expires: '.strftime('%Y-%m-%d', localtime($key->{expiration})).']'
       if defined $key->{expiration};
-    $str .= ' ' x (72 + 1 - length($str) - length($key->{caps})) . $key->{caps};
+    $str .= ' ' x (72 + 1 - length($str) - length($key->{caps}) - 2) . '['.$key->{caps}.']';
     $str . sprintf "\n     Key fingerprint = %s %s %s %s %s  %s %s %s %s %s\n",
                    map { substr($key->{fpr}, ($_ * 4), 4) } (0..9);
 }