[Rt-commit] r7401 - in rt/branches/3.7-EXPERIMENTAL: .

[ruz at bestpractical.com]

Author: ruz
Date: Thu Mar 29 21:27:28 2007
New Revision: 7401

Modified:
   rt/branches/3.7-EXPERIMENTAL/   (props changed)
   rt/branches/3.7-EXPERIMENTAL/lib/RT/Crypt/GnuPG.pm

Log:
 r4868 at cubic-pc:  cubic | 2007-03-30 05:14:45 +0400
 * use fixed-list-mode, so each user has own uid record


Modified: rt/branches/3.7-EXPERIMENTAL/lib/RT/Crypt/GnuPG.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/lib/RT/Crypt/GnuPG.pm	(original)
+++ rt/branches/3.7-EXPERIMENTAL/lib/RT/Crypt/GnuPG.pm	Thu Mar 29 21:27:28 2007
@@ -828,7 +828,8 @@
     my $gnupg = new GnuPG::Interface;
     my %opt = RT->Config->Get('GnuPG');
     $opt{'digest-algo'} ||= 'SHA1';
-    $opt{'with-colons'} = undef;
+    $opt{'with-colons'} = undef; # parseable format
+    $opt{'fixed-list-mode'} = undef; # don't merge uid with keys
     $gnupg->options->hash_init(
         _PrepareGnuPGOptions( %opt ),
         armor => 1,
@@ -889,7 +890,7 @@
             @info{ qw(
                 Trust KeyLenght Algorithm Key
                 Created Expire Empty OwnerTrust
-                User Empty KeyCapabilities Other
+                Empty Empty KeyCapabilities Other
             ) } = split /:/, $line, 12;
             $info{'Trust'} = _ConvertTrustChar( $info{'Trust'} );
             $info{'OwnerTrust'} = _ConvertTrustChar( $info{'OwnerTrust'} );
@@ -902,7 +903,7 @@
             @info{ qw(
                 Empty KeyLenght Algorithm Key
                 Created Expire Empty OwnerTrust
-                User Empty KeyCapabilities Other
+                Empty Empty KeyCapabilities Other
             ) } = split /:/, $line, 12;
             $info{'OwnerTrust'} = _ConvertTrustChar( $info{'OwnerTrust'} );
             $info{ $_ } = _ParseDate( $info{ $_ } )