svn commit: r1860697 - /spamassassin/trunk/build/mkupdates/listpromotable

[pd...@apache.org]

Author: pds
Date: Thu Jun  6 05:54:52 2019
New Revision: 1860697

URL: http://svn.apache.org/viewvc?rev=1860697&view=rev
Log:
List promo logic cleanup

Modified:
    spamassassin/trunk/build/mkupdates/listpromotable

Modified: spamassassin/trunk/build/mkupdates/listpromotable
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/mkupdates/listpromotable?rev=1860697&r1=1860696&r2=1860697&view=diff
==============================================================================
--- spamassassin/trunk/build/mkupdates/listpromotable (original)
+++ spamassassin/trunk/build/mkupdates/listpromotable Thu Jun  6 05:54:52 2019
@@ -235,8 +235,8 @@ foreach my $plistkey (sort keys %{$plist
   # ie a rule must be promotable in all 3, to be listed.  (Also allow
   # rules that weren't in existence in the earlier mass-checks.)
   next unless ($plist->[1]->{$plistkey}->{promo});
-  next unless ($plist->[2]->{$plistkey}->{promo} or $plist->[2]->{"T_$plistkey"}->{promo} or !defined($plist->[2]->{$plistkey}->{promo}));
-  next unless ($plist->[3]->{$plistkey}->{promo} or $plist->[3]->{"T_$plistkey"}->{promo} or !defined($plist->[3]->{$plistkey}->{promo}));
+  next unless ($plist->[2]->{$name}->{promo} or $plist->[2]->{"T_$name"}->{promo} or !defined($plist->[2]->{$plistkey}->{promo}));
+  next unless ($plist->[3]->{$name}->{promo} or $plist->[3]->{"T_$name"}->{promo} or !defined($plist->[3]->{$plistkey}->{promo}));
 
   # only rules from "rulesrc" dirs
   my $src = $mailsa->{conf}->{source_file}->{$name};