Mailing List Archive

Author: felicity
Date: Sun Aug 20 14:09:27 2006
New Revision: 433045

URL: http://svn.apache.org/viewvc?rev=433045&view=rev
Log:
bug 5049: allow commented lines in gpgkeyfile and channelfile files

Modified:
spamassassin/branches/3.1/sa-update.raw

Modified: spamassassin/branches/3.1/sa-update.raw
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.1/sa-update.raw?rev=433045&r1=433044&r2=433045&view=diff
==============================================================================
--- spamassassin/branches/3.1/sa-update.raw (original)
+++ spamassassin/branches/3.1/sa-update.raw Sun Aug 20 14:09:27 2006
@@ -259,6 +259,7 @@

dbg("gpg: reading in gpgfile ".$opt{'gpgkeyfile'});
while(my $key = <GPG>) {
+ next if ($key =~ /^#/); # explicitly skip comments
unless (is_valid_gpg_key_id($key)) {
dbg("gpg: invalid key id $key");
next;
@@ -321,6 +322,7 @@
dbg("channel: reading in channelfile ".$opt{'channelfile'});
@channels = ();
while(my $chan = <CHAN>) {
+ next if ($chan =~ /^#/); # explicitly skip comments
chomp $chan;
$chan = lc $chan;
dbg("channel: adding $chan");