Mailing List Archive

Author: hege
Date: Sun Jun 5 08:24:49 2022
New Revision: 1901657

URL: http://svn.apache.org/viewvc?rev=1901657&view=rev
Log:
Fix revision 1901651

Modified:
spamassassin/trunk/t/re_base_extraction.t

Modified: spamassassin/trunk/t/re_base_extraction.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/re_base_extraction.t?rev=1901657&r1=1901656&r2=1901657&view=diff
==============================================================================
--- spamassassin/trunk/t/re_base_extraction.t (original)
+++ spamassassin/trunk/t/re_base_extraction.t Sun Jun 5 08:24:49 2022
@@ -438,11 +438,13 @@ sub try_extraction {
ok($sa);

# remove all rules and plugins; we want just our stuff
- rmtree("$siterules/*.pre", "$siterules/*.pm", { safe=> 1 });
+ foreach (<$siterules/*.pre>, <$siterules/*.pm>) {
+ unlink(untaint_var($_));
+ }
# keep 20_aux_tlds.cf to suppress RB warnings
- rename("$localrules/20_aux_tlds.cf", "$localrules/20_aux_tlds.cf.tmp");
- rmtree("$localrules/*.cf", { safe=> 1 });
- rename("$localrules/20_aux_tlds.cf.tmp", "$localrules/20_aux_tlds.cf");
+ foreach (<$localrules/*.cf>) {
+ unlink(untaint_var($_)) unless $_ =~ /20_aux_tlds.cf$/;
+ }

{ # suppress unnecessary warning:
# "Filehandle STDIN reopened as STDOUT only for output"