(fmtutil_cnf_lines): report the actual unknown

directive, not just the line.


git-svn-id: svn://tug.org/texlive/trunk@13467 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 4 insertions, 5 deletions

diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm
index 8bd4e4c8a30..eb8ef4cdea2 100644
--- a/Master/tlpkg/TeXLive/TLPOBJ.pm
+++ b/Master/tlpkg/TeXLive/TLPOBJ.pm
@@ -928,21 +928,20 @@ sub fmtutil_cnf_lines {
       my $options = "";
       my $mode = "";
       if ($first) {
-        push @fmtlines, "# from $pkg:\n";
+        push @fmtlines, "#\n# from $pkg:\n";
         $first = 0;
       }
-      foreach my $p (&TeXLive::TLUtils::quotewords('\s+', 0, "$1")) {
-      # foreach my $p (split(' ', $1)) {
+      for my $p (&TeXLive::TLUtils::quotewords('\s+', 0, "$1")) {
         my ($a, $b);
         if ($p =~ m/^(name|engine|mode|patterns|options)=(.*)$/) {
           $a = $1;
           $b = $2;
         } else {
-          die "Unknown format directive in $pkg: $e";
+          die "Unknown format directive $p in $pkg (line=$e)";
         }
         if ($a eq "name") { 
           die "AddFormat line needs name=something: $pkg, $e" unless $b;
-          $name = $b; next; 
+          $name = $b; next;
         }
         if ($a eq "engine") { 
           die "AddFormat line needs engine=something: $pkg, $e" unless $b;