INN commit: branches/2.5/control (perl-nocem.in)

[INN Commit]

    Date: Saturday, June 20, 2009 @ 08:16:06
  Author: iulius
Revision: 8529

Fix a bug in how perl-nocem parses its configuration file.  A condition
was not right.

Modified:
  branches/2.5/control/perl-nocem.in

---------------+
 perl-nocem.in |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

Modified: perl-nocem.in
===================================================================
--- perl-nocem.in	2009-06-20 15:14:49 UTC (rev 8528)
+++ perl-nocem.in	2009-06-20 15:16:06 UTC (rev 8529)
@@ -442,13 +442,18 @@
     }
     while (<CTLFILE>) {
         chop;
-        s/^\s+//; s/\s+$//;
+        s/^\s+//;
+        s/\s+$//;
         next if /^#/ or /^$/;
         my ($issuer, $type) = split(/:/, lc $_);
-        logmsg("Cannot parse nocem.ctl line <<$_>>", 'err')
-            if not $issuer and $type;
+        if (not (defined($issuer) and defined($type))) {
+            logmsg("Cannot parse nocem.ctl line <<$_>>; syntax is <<issuer:type>>.", 'err');
+            next;
+        }
         $type =~ s/\s//g;
-        push @ncmperm, "$issuer\001$_" foreach split(/,/, $type);
+        foreach (split(/,/, $type)) {
+            push(@ncmperm, "$issuer\001$_");
+        }
     }
     close CTLFILE;
     return 1;