[Bug 6698] New DCC.pm improves performance, is more resilient.

[bu...@bugzilla.spamassassin.org]

https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6698

Henrik Krohns <he...@hege.li> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |hege@hege.li

--- Comment #25 from Henrik Krohns <he...@hege.li> 2012-04-01 14:28:33 UTC ---
Fixed the annoying uninitialized dcc_libexec when cdcc binary is not in path.
All the path search stuff here is too confusing to make a more "elegant" fix.

Also a pointless $dcc_libexec removed.

--- DCC.pm      (revision 1307734)
+++ DCC.pm      (working copy)
@@ -425,7 +425,6 @@

 sub find_dcc_home {
   my ($self) = @_;
-  my $dcc_libexec;

   # just once
   return if defined $self->{dcc_version};
@@ -515,6 +514,7 @@
   # try dcc_home/bin, dcc_libexec, and some desperate last attempts
   foreach my $dir ($conf->{dcc_home}.'/bin',  $conf->{dcc_libexec},
                    '/usr/local/bin', '/usr/local/dcc', '/var/dcc') {
+    next unless defined $dir;
     $pgmpath = $dir . '/' . $pgm;
     if (-x $pgmpath) {
       dbg("dcc: dcc_pgm_path, found %s in %s: %s", $pgm,$dir,$pgmpath);


Sending        DCC.pm
Transmitting file data .
Committed revision 1308124.

-- 
Configure bugmail: https://issues.apache.org/SpamAssassin/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.