Mailing List Archive

svn commit: r1880309 - in /spamassassin/trunk/masses: fp-fn-statistics logs-to-c rewrite-cf-with-new-scores score-ranges-from-freqs
Author: hege
Date: Sun Jul 26 05:53:12 2020
New Revision: 1880309

URL: http://svn.apache.org/viewvc?rev=1880309&view=rev
Log:
Fix require "/tmp/rules.pl" to use absolute path "./tmp/rules.pl"

Modified:
spamassassin/trunk/masses/fp-fn-statistics
spamassassin/trunk/masses/logs-to-c
spamassassin/trunk/masses/rewrite-cf-with-new-scores
spamassassin/trunk/masses/score-ranges-from-freqs

Modified: spamassassin/trunk/masses/fp-fn-statistics
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/fp-fn-statistics?rev=1880309&r1=1880308&r2=1880309&view=diff
==============================================================================
--- spamassassin/trunk/masses/fp-fn-statistics (original)
+++ spamassassin/trunk/masses/fp-fn-statistics Sun Jul 26 05:53:12 2020
@@ -188,11 +188,11 @@ sub readlogs {

sub readscores {
print "Reading scores from \"$opt_cffile\"...\n";
- my $cmd = "../build/parse-rules-for-masses -o tmp/rules_$$.pl -d \"$opt_cffile\" -s $opt_scoreset";
+ my $cmd = "../build/parse-rules-for-masses -o ./tmp/rules_$$.pl -d \"$opt_cffile\" -s $opt_scoreset";
warn "[$cmd]\n";
system ($cmd) and die;
- require "tmp/rules_$$.pl";
- unlink "tmp/rules_$$.pl";
+ require "./tmp/rules_$$.pl";
+ unlink "./tmp/rules_$$.pl";
%allrules = %rules; # ensure it stays global
}


Modified: spamassassin/trunk/masses/logs-to-c
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/logs-to-c?rev=1880309&r1=1880308&r2=1880309&view=diff
==============================================================================
--- spamassassin/trunk/masses/logs-to-c (original)
+++ spamassassin/trunk/masses/logs-to-c Sun Jul 26 05:53:12 2020
@@ -174,7 +174,7 @@ sub readlogs {

sub readscores {
print "Reading scores from \"$opt_cffile\"...\n";
- my $tmpf = "tmp/rules$$.pl";
+ my $tmpf = "./tmp/rules$$.pl";
system "../build/parse-rules-for-masses ".
"-d \"$opt_cffile\" -s $opt_scoreset -o $tmpf" and die;
require $tmpf;

Modified: spamassassin/trunk/masses/rewrite-cf-with-new-scores
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/rewrite-cf-with-new-scores?rev=1880309&r1=1880308&r2=1880309&view=diff
==============================================================================
--- spamassassin/trunk/masses/rewrite-cf-with-new-scores (original)
+++ spamassassin/trunk/masses/rewrite-cf-with-new-scores Sun Jul 26 05:53:12 2020
@@ -188,7 +188,7 @@ exit;


sub read_rules {
- my $tmpf = "tmp/rules$$.pl";
+ my $tmpf = "./tmp/rules$$.pl";
system "../build/parse-rules-for-masses ".
"-d \"$opt_cffile\" -s $opt_scoreset -o $tmpf" and die;
require $tmpf;

Modified: spamassassin/trunk/masses/score-ranges-from-freqs
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/score-ranges-from-freqs?rev=1880309&r1=1880308&r2=1880309&view=diff
==============================================================================
--- spamassassin/trunk/masses/score-ranges-from-freqs (original)
+++ spamassassin/trunk/masses/score-ranges-from-freqs Sun Jul 26 05:53:12 2020
@@ -35,7 +35,7 @@ my %is_nice = ();

if (!defined $argcffile) { $argcffile = "../rules"; }

-my $tmpf = "tmp/rules$$.pl";
+my $tmpf = "./tmp/rules$$.pl";
system "../build/parse-rules-for-masses ".
"-d \"$argcffile\" -s $scoreset -o $tmpf" and die;
require $tmpf;