Mailing List Archive

Author: billcole
Date: Thu Jul 9 20:42:56 2020
New Revision: 1879726

URL: http://svn.apache.org/viewvc?rev=1879726&view=rev
Log:
Don't treat versions like simple numbers

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=1879726&r1=1879725&r2=1879726&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util/DependencyInfo.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util/DependencyInfo.pm Thu Jul 9 20:42:56 2020
@@ -33,6 +33,7 @@ use strict;
use warnings;
# use bytes;
use re 'taint';
+use version 0.77;

our ( $EXIT_STATUS, $WARNINGS );

@@ -654,7 +655,7 @@ sub try_module {
if ($installed) {
eval { $module_version = $moddef->{module}->VERSION }; # wrap just in case
if (!$recommended_version ||
- ($module_version && $module_version >= $recommended_version)) {
+ ($module_version && version->parse($module_version) >= version->parse($recommended_version))) {
$version_meets_recommended = 1;
}
$module_version = '' if !defined $module_version;

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm?rev=1879726&r1=1879725&r2=1879726&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm Thu Jul 9 20:42:56 2020
@@ -31,8 +31,8 @@ package Mail::SpamAssassin::Util::Depend

use strict;
use warnings;
-# use bytes;
use re 'taint';
+use version 0.77;

our ( $EXIT_STATUS, $WARNINGS );

@@ -665,7 +665,7 @@ sub try_module {
if ($installed) {
eval { $module_version = $moddef->{module}->VERSION }; # wrap just in case
if (!$recommended_version ||
- ($module_version && $module_version >= $recommended_version)) {
+ ($module_version && version->parse($module_version) >= version->parse($recommended_version))) {
$version_meets_recommended = 1;
}
$module_version = '' if !defined $module_version;