You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2018/10/04 04:49:18 UTC
svn commit: r1842773 - in /spamassassin:
branches/3.4/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
Author: hege
Date: Thu Oct 4 04:49:18 2018
New Revision: 1842773
URL: http://svn.apache.org/viewvc?rev=1842773&view=rev
Log:
Bug 7589 - Tag optional modules in debug_diagnostics
Modified:
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util/DependencyInfo.pm?rev=1842773&r1=1842772&r2=1842773&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util/DependencyInfo.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util/DependencyInfo.pm Thu Oct 4 04:49:18 2018
@@ -346,15 +346,17 @@ sub debug_diagnostics {
# sub Net::Ident::_export_hooks;
# ';
- foreach my $moddef (@MODULES, @OPTIONAL_MODULES) {
+ my $prefix = '';
+ foreach my $moddef (@MODULES, 'optional', @OPTIONAL_MODULES) {
+ if ($moddef eq 'optional') { $prefix = 'optional '; next; }
my $module = $moddef->{module};
my $modver;
if (eval ' require '.$module.'; $modver = $'.$module.'::VERSION; 1;')
{
$modver ||= '(undef)';
- $out .= "module installed: $module, version $modver\n";
+ $out .= "${prefix}module installed: $module, version $modver\n";
} else {
- $out .= "module not installed: $module ('require' failed)\n";
+ $out .= "${prefix}module not installed: $module ('require' failed)\n";
}
}
return $out;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm?rev=1842773&r1=1842772&r2=1842773&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm Thu Oct 4 04:49:18 2018
@@ -366,15 +366,17 @@ sub debug_diagnostics {
# sub Net::Ident::_export_hooks;
# ';
- foreach my $moddef (@MODULES, @OPTIONAL_MODULES) {
+ my $prefix = '';
+ foreach my $moddef (@MODULES, 'optional', @OPTIONAL_MODULES) {
+ if ($moddef eq 'optional') { $prefix = 'optional '; next; }
my $module = $moddef->{module};
my $modver;
if (eval ' require '.$module.'; $modver = $'.$module.'::VERSION; 1;')
{
$modver ||= '(undef)';
- $out .= "module installed: $module, version $modver\n";
+ $out .= "${prefix}module installed: $module, version $modver\n";
} else {
- $out .= "module not installed: $module ('require' failed)\n";
+ $out .= "${prefix}module not installed: $module ('require' failed)\n";
}
}
return $out;