mmartinec at apache
Aug 17, 2012, 4:58 AM
Post #1 of 1
(49 views)
Permalink
|
|
svn commit: r1374213 - /spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
|
|
Author: mmartinec
Date: Fri Aug 17 11:58:39 2012
New Revision: 1374213
URL: http://svn.apache.org/viewvc?rev=1374213&view=rev
Log:
Bug 6829: Avoid unsightly warnings in SA::Util::DependencyInfo when gpg is missing
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm?rev=1374213&r1=1374212&r2=1374213&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm Fri Aug 17 11:58:39 2012
@@ -350,7 +350,9 @@ sub try_binary {
$command = "which $bindef->{'binary'} 2>&1";
$output = `$command`;
- if ($output =~ /which: no $bindef->{'binary'} in/i) {
+ if (!defined $output || $output eq '') {
+ $installed = 0;
+ } elsif ($output =~ /which: no \Q$bindef->{'binary'}\E in/i) {
$installed = 0;
} else {
#COMMAND APPEARS TO EXIST
@@ -459,7 +461,8 @@ sub test_version {
my ($count1, $count2, $i, $fail);
#CAN'T TEST NON NUMERIC VERSIONS
- if ($version1 =~ /[^0-9\.]/ or $version2 =~ /[^0-9\.]/) {
+ if (!defined($version1) or !defined($version2) or
+ $version1 !~ /^[0-9][0-9.]*\z/ or $version2 !~ /^[0-9][0-9.]*\z/) {
return -1;
}
|
