Integrate:

[ 21384]
Nit to the maintainers list by SADAHIRO Tomoyuki

[ 21408]
Add a new option --check to Porting/Maintainers,
to check for files who are listed for several maintainers.

[ 21413]
Fixes in the modules maintainers list.
p4raw-link: @21413 on //depot/perl: b04375185d3988e648dcd1baf92b9e93db96ee39
p4raw-link: @21408 on //depot/perl: 678b26d7b9646dc9eb095b5ecda180cacd3ce8a1
p4raw-link: @21384 on //depot/perl: fbb0f87ffaeeb5b3371a2e6fbf9f66a3cb48d16d

p4raw-id: //depot/maint-5.8/perl@21477
p4raw-integrated: from //depot/perl@21476 'copy in'
	Porting/Maintainers.pm (@20491..) 'edit in'
	Porting/Maintainers.pl (@21384..)

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 996f5a4..0446054 100644 (file)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -237,7 +237,7 @@ package Maintainers;
                'CPAN'          => 1,
                },
 
-       'Scalar-List-Util' =>
+       'Scalar-List-Utils' =>
                {
                'MAINTAINER'    => 'gbarr',
                'FILES'         => q[ext/List/Util],
@@ -318,7 +318,7 @@ package Maintainers;
        'PerlIO' =>
                {
                'MAINTAINER'    => 'p5p',
-               'FILES'         => q[ext/PerlIO lib/PerlIO],
+               'FILES'         => q[ext/PerlIO],
                'CPAN'          => 1,
                },
 
@@ -331,7 +331,7 @@ package Maintainers;
                'CPAN'          => 0,
                },
 
-       'Perlio::via::QuotedPrint' =>
+       'PerlIO::via::QuotedPrint' =>
                {
                'MAINTAINER'    => 'elizabeth',
                'FILES'         => q[lib/PerlIO/via/QuotedPrint.pm
@@ -367,17 +367,9 @@ package Maintainers;
                'CPAN'          => 0,
                },
 
-       'Pod::Checker' => {     
+       'PodParser' => {
                'MAINTAINER'    => 'marekr',
-               'FILES' => q[lib/Pod/Checker.pm pod/podchecker.PL
-                                       t/pod/testpchk.pl],
-               'CPAN'          => 1,
-               },
-
-       'Pod::Find' =>
-               {
-               'MAINTAINER'    => 'marekr',
-               'FILES'         => q[lib/Pod/Find.pm t/pod/find.t],
+               'FILES' => q[lib/Pod/{InputObjects,Parser,ParseUtils,Select,PlainText,Usage,Checker,Find}.pm pod/pod{select,2usage,checker}.PL t/pod/testcmp.pl t/pod/testp2pt.pl t/pod/testpchk.pl t/pod/emptycmd.* t/pod/find.t t/pod/for.* t/pod/headings.* t/pod/include.* t/pod/included.* t/pod/lref.* t/pod/multiline_items.* t/pod/nested_items.* t/pod/nested_seqs.* t/pod/oneline_cmds.* t/pod/poderrs.* t/pod/pod2usage.* t/pod/podselect.* t/pod/special_seqs.*],
                'CPAN'          => 1,
                },
 
@@ -391,16 +383,7 @@ package Maintainers;
        'podlators' =>
                {
                'MAINTAINER'    => 'rra',
-               'FILES'         => q[lib/Pod/{Checker,Find,Html,InputObjects,Man,ParseLink,Parser,ParseUtils,PlainText,Select,Text,Text/{Color,Overstrike,Termcap},Usage}.pm pod/pod2man.PL pod/pod2text.PL lib/Pod/t/{basic.*,{basic,man,parselink,text*}.t} lib/Pod/t/{InputObjects,Select,Usage,utils}.t],
-               'CPAN'          => 1,
-               },
-
-       'Pod::Parser' => {
-               'MAINTAINER'    => 'marekr',
-               'FILES' => q[lib/Pod/{InputObjects,Parse{r,Utils}}.pm   
-                               t/pod/testcmp.pl 
-                               t/pod/{emptycmd,for,headings,include{,d},lref,{multiline,nested}_items,{nested,special}_seqs,oneline_cmds,poderrs}.{t,xr}
-                           ],
+               'FILES'         => q[lib/Pod/{Html,Man,ParseLink,Text,Text/{Color,Overstrike,Termcap}}.pm pod/pod2man.PL pod/pod2text.PL lib/Pod/t/{basic.*,{man,parselink,text*}.t}],
                'CPAN'          => 1,
                },
 
@@ -418,26 +401,6 @@ package Maintainers;
                'CPAN'          => 0,
                },
 
-       'Pod::PlainText' => {
-               'MAINTAINER'    => 'marekr',
-               'FILES' => q[lib/Pod/PlainText.pm t/pod/testp2pt.pl],
-               'CPAN'          => 1,
-               },
-
-       'Pod::Select'    => {
-               'MAINTAINER'    => 'marekr',
-               'FILES' => q[lib/Pod/Select.pm pod/podselect.PL
-                                       t/pod/podselect.{t,xr}],
-               'CPAN'          => 1,
-               },
-
-       'Pod::Usage' => {       
-               'MAINTAINER'    => 'marekr',
-               'FILES' => q[lib/Pod/Usage.pm pod/pod2usage.PL
-                                       t/pod/pod2usage.{t,xr}],
-               'CPAN'          => 1,
-               },
-
        'Safe' =>
                {
                'MAINTAINER'    => 'abergman',

diff --git a/Porting/Maintainers.pm b/Porting/Maintainers.pm
index 3cf4856..b8959e8 100644 (file)
--- a/Porting/Maintainers.pm
+++ b/Porting/Maintainers.pm
@@ -67,10 +67,11 @@ sub get_maintainer_modules {
 
 sub usage {
     print <<__EOF__;
-$0: Usage: $0 [[--maintainer M --module M --files]|file ...]
+$0: Usage: $0 [[--maintainer M --module M --files --check]|file ...]
 --maintainer M list all maintainers matching M
 --module M     list all modules matching M
 --files                list all files
+--check                check consistency of Maintainers.pl
 Matching is case-ignoring regexp, author matching is both by
 the short id and by the full name and email.  A "module" may
 not be just a module, it may be a file or files or a subdirectory.
@@ -82,6 +83,7 @@ __EOF__
 my $Maintainer;
 my $Module;
 my $Files;
+my $Check;
 
 sub process_options {
     usage()
@@ -90,6 +92,7 @@ sub process_options {
                       'maintainer=s'   => \$Maintainer,
                       'module=s'       => \$Module,
                       'files'          => \$Files,
+                      'check'          => \$Check,
                      );
 
     my @Files = @ARGV;
@@ -219,10 +222,27 @@ sub show_results {
            }
        }
     }
+    elsif ($Check) {
+       duplicated_maintainers();
+    }
     else {
        usage();
     }
 }
 
+sub duplicated_maintainers {
+    my %files;
+    for my $k (keys %Modules) {
+       for my $f (get_module_files($k)) {
+           ++$files{$f};
+       }
+    }
+    for my $f (keys %files) {
+       if ($files{$f} > 1) {
+           warn "File $f appears $files{$f} times in Maintainers.pl\n";
+       }
+    }
+}
+
 1;