Sfoglia il codice sorgente

wikiheaders: Report full path when dying for a doubly-defined section.

(cherry picked from commit 1d4b0337ac50d447ac8c51b6ee047fe62fcbb145)
Ryan C. Gordon 4 settimane fa
parent
commit
8e22e4f916
1 ha cambiato i file con 5 aggiunte e 5 eliminazioni
  1. 5 5
      build-scripts/wikiheaders.pl

+ 5 - 5
build-scripts/wikiheaders.pl

@@ -1786,20 +1786,20 @@ while (my $d = readdir(DH)) {
             } elsif (/\A\= (.*?) \=\Z/) {
             } elsif (/\A\= (.*?) \=\Z/) {
                 $firstline = 0;
                 $firstline = 0;
                 $current_section = ($1 eq $sym) ? '[Brief]' : $1;
                 $current_section = ($1 eq $sym) ? '[Brief]' : $1;
-                die("Doubly-defined section '$current_section' in '$dent'!\n") if defined $sections{$current_section};
+                die("Doubly-defined section '$current_section' in '$wikipath/$dent'!\n") if defined $sections{$current_section};
                 push @section_order, $current_section;
                 push @section_order, $current_section;
                 $sections{$current_section} = '';
                 $sections{$current_section} = '';
             } elsif (/\A\=\= (.*?) \=\=\Z/) {
             } elsif (/\A\=\= (.*?) \=\=\Z/) {
                 $firstline = 0;
                 $firstline = 0;
                 $current_section = ($1 eq $sym) ? '[Brief]' : $1;
                 $current_section = ($1 eq $sym) ? '[Brief]' : $1;
-                die("Doubly-defined section '$current_section' in '$dent'!\n") if defined $sections{$current_section};
+                die("Doubly-defined section '$current_section' in '$wikipath/$dent'!\n") if defined $sections{$current_section};
                 push @section_order, $current_section;
                 push @section_order, $current_section;
                 $sections{$current_section} = '';
                 $sections{$current_section} = '';
                 next;
                 next;
             } elsif (/\A\-\-\-\-\Z/) {
             } elsif (/\A\-\-\-\-\Z/) {
                 $firstline = 0;
                 $firstline = 0;
                 $current_section = '[footer]';
                 $current_section = '[footer]';
-                die("Doubly-defined section '$current_section' in '$dent'!\n") if defined $sections{$current_section};
+                die("Doubly-defined section '$current_section' in '$wikipath/$dent'!\n") if defined $sections{$current_section};
                 push @section_order, $current_section;
                 push @section_order, $current_section;
                 $sections{$current_section} = '';
                 $sections{$current_section} = '';
                 next;
                 next;
@@ -1811,14 +1811,14 @@ while (my $d = readdir(DH)) {
             } elsif (/\A\#+ (.*?)\Z/) {
             } elsif (/\A\#+ (.*?)\Z/) {
                 $firstline = 0;
                 $firstline = 0;
                 $current_section = ($1 eq $sym) ? '[Brief]' : $1;
                 $current_section = ($1 eq $sym) ? '[Brief]' : $1;
-                die("Doubly-defined section '$current_section' in '$dent'!\n") if defined $sections{$current_section};
+                die("Doubly-defined section '$current_section' in '$wikipath/$dent'!\n") if defined $sections{$current_section};
                 push @section_order, $current_section;
                 push @section_order, $current_section;
                 $sections{$current_section} = '';
                 $sections{$current_section} = '';
                 next;
                 next;
             } elsif (/\A\-\-\-\-\Z/) {
             } elsif (/\A\-\-\-\-\Z/) {
                 $firstline = 0;
                 $firstline = 0;
                 $current_section = '[footer]';
                 $current_section = '[footer]';
-                die("Doubly-defined section '$current_section' in '$dent'!\n") if defined $sections{$current_section};
+                die("Doubly-defined section '$current_section' in '$wikipath/$dent'!\n") if defined $sections{$current_section};
                 push @section_order, $current_section;
                 push @section_order, $current_section;
                 $sections{$current_section} = '';
                 $sections{$current_section} = '';
                 next;
                 next;