[Rt-commit] r16600 - in rt/3.8/trunk: .

[falcone at bestpractical.com]

Author: falcone
Date: Wed Oct 29 12:25:08 2008
New Revision: 16600

Modified:
   rt/3.8/trunk/   (props changed)
   rt/3.8/trunk/lib/RT/Config.pm

Log:
 r41146 at ketch:  falcone | 2008-10-29 12:03:20 -0400
 * don't bother checking for data/gpg if the
   user explicitly turned gpg off


Modified: rt/3.8/trunk/lib/RT/Config.pm
==============================================================================
--- rt/3.8/trunk/lib/RT/Config.pm	(original)
+++ rt/3.8/trunk/lib/RT/Config.pm	Wed Oct 29 12:25:08 2008
@@ -332,6 +332,7 @@
         PostLoadCheck => sub {
             my $self = shift;
             my $gpg = $self->Get('GnuPG');
+            return unless $gpg->{'Enable'};
             my $gpgopts = $self->Get('GnuPGOptions');
             unless (-d $gpgopts->{homedir}  && -r _ ) { # no homedir, no gpg
                 $RT::Logger->debug(
@@ -342,14 +343,12 @@
             }
 
 
-            if ($gpg->{'Enable'}) {
-                require RT::Crypt::GnuPG;
-                unless (RT::Crypt::GnuPG->Probe()) {
-                    $RT::Logger->debug(
-                        "RT's GnuPG libraries couldn't successfully execute gpg.".
-                        " PGP support has been disabled");
-                    $gpg->{'Enable'} = 0;
-                }
+            require RT::Crypt::GnuPG;
+            unless (RT::Crypt::GnuPG->Probe()) {
+                $RT::Logger->debug(
+                    "RT's GnuPG libraries couldn't successfully execute gpg.".
+                    " PGP support has been disabled");
+                $gpg->{'Enable'} = 0;
             }
         }
     },