In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/7964dbe80fa46b64ff4230a91ea80f07ec1725ad?hp=a97f47a27063aa59b5124b9d7c3d5a296eae0d48>
- Log ----------------------------------------------------------------- commit 7964dbe80fa46b64ff4230a91ea80f07ec1725ad Author: Jesse Vincent <[email protected]> Date: Mon Oct 19 15:52:19 2009 -0400 Maintainers.pl had a number of MAP errors due to the ext->cpan reorg M Porting/Maintainers.pl commit 9546b88d218df8131ea4f6379e8688e6bf53ffcf Author: Jesse Vincent <[email protected]> Date: Mon Oct 19 15:37:17 2009 -0400 Make core-cpan-diff more aware of the new world order M Porting/core-cpan-diff commit d55832d0634f6552c3fb50ca38aa6149c7a653df Author: Jesse Vincent <[email protected]> Date: Mon Oct 19 15:18:35 2009 -0400 Porting/core-cpan-diff now tells us who the upstream is for dual-lifed modules M Porting/core-cpan-diff ----------------------------------------------------------------------- Summary of changes: Porting/Maintainers.pl | 22 +++++++++++----------- Porting/core-cpan-diff | 21 ++++++++++++++------- 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 4a4933d..982c079 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -658,8 +658,8 @@ use File::Glob qw(:case); t/pod.t } ], - 'MAP' => { '' => 'lib/File/', - 't/' => 't/', + 'MAP' => { '' => 'cpan/File-Path/lib/File/', + 't/' => 'cpan/File-Path/t/', }, 'CPAN' => 1, 'UPSTREAM' => undef, @@ -716,10 +716,10 @@ use File::Glob qw(:case); t/tee.t } ], - 'MAP' => { 'Call/' => 'ext/Filter-Util-Call/', - 'filter-util.pl' => 't/lib/filter-util.pl', + 'MAP' => { 'Call/' => 'cpan/Filter-Util-Call/', + 'filter-util.pl' => 'cpan/Filter-Util-Call/filter-util.pl', 'perlfilter.pod' => 'pod/perlfilter.pod', - '' => 'ext/Filter-Util-Call/', + '' => 'cpan/Filter-Util-Call/', }, 'CPAN' => 1, 'UPSTREAM' => undef, @@ -921,9 +921,9 @@ use File::Glob qw(:case); t/mbimbf.t }, ], - 'MAP' => { '' => 'ext/Math-BigInt-FastCalc/', + 'MAP' => { '' => 'cpan/Math-BigInt-FastCalc/', 'lib/Math/BigInt/FastCalc.pm' - => 'ext/Math-BigInt-FastCalc/FastCalc.pm', + => 'cpan/Math-BigInt-FastCalc/FastCalc.pm', }, 'CPAN' => 1, 'UPSTREAM' => undef, @@ -1473,8 +1473,8 @@ use File::Glob qw(:case); 'EXCLUDED' => [ qw( t/pod.t ) ], # For the benefit of make_ext.pl, we have to have this accessible: 'MAP' => { - 'ParseWords.pm' => 'ext/Text-ParseWords/lib/Text/ParseWords.pm', - '' => 'ext/Text-ParseWords/', + 'ParseWords.pm' => 'cpan/Text-ParseWords/lib/Text/ParseWords.pm', + '' => 'cpan/Text-ParseWords/', }, 'CPAN' => 1, 'UPSTREAM' => undef, @@ -1485,11 +1485,11 @@ use File::Glob qw(:case); 'MAINTAINER' => 'markm', 'DISTRIBUTION' => 'MARKM/Text-Soundex-3.03.tar.gz', 'FILES' => q[cpan/Text-Soundex], - 'MAP' => { '' => 'ext/Text-Soundex/', + 'MAP' => { '' => 'cpan/Text-Soundex/', # XXX these two files are clearly related, # but they appear to have diverged # considerably over the years - 'test.pl' => 'ext/Text-Soundex/t/Soundex.t', + 'test.pl' => 'cpan/Text-Soundex/t/Soundex.t', }, 'CPAN' => 1, 'UPSTREAM' => undef, diff --git a/Porting/core-cpan-diff b/Porting/core-cpan-diff index 7dc907b..0e9f747 100755 --- a/Porting/core-cpan-diff +++ b/Porting/core-cpan-diff @@ -191,7 +191,6 @@ sub do_compare { my %seen_dist; for my $module (@$modules) { warn "Processing $module ...\n" if defined $output_file; - print $outfh "\n$module\n" unless $use_diff; my $m = $Maintainers::Modules{$module} or die "ERROR: No such module in Maintainers.pl: '$module'\n"; @@ -207,6 +206,10 @@ sub do_compare { if ($seen_dist{$dist}) { warn "WARNING: duplicate entry for $dist in $module\n" } + + print $outfh "\n$module - ".$Maintainers::Modules{$module}->{DISTRIBUTION}."\n" unless $use_diff; + print $outfh " upstream is: ".($m->{UPSTREAM} || 'UNKNOWN!')."\n"; + $seen_dist{$dist}++; my $cpan_dir; @@ -284,27 +287,31 @@ EOF next; } + my $relative_mapped_file = $mapped_file; + $relative_mapped_file =~ s/^(cpan|dist|ext)\/.*?\///; if (File::Compare::compare($abs_cpan_file, $mapped_file)) { - if ($use_diff) { + + + if ($use_diff) { file_diff($outfh, $abs_cpan_file, $mapped_file, $reverse, $diff_opts); } else { - if ($cpan_file eq $mapped_file) { - print $outfh " Modified: $cpan_file\n"; + if ($cpan_file eq $relative_mapped_file) { + print $outfh " Modified: $relative_mapped_file\n"; } else { - print $outfh " Modified: $cpan_file $mapped_file\n"; + print $outfh " Modified: $cpan_file $relative_mapped_file\n"; } } } elsif ($verbose) { - if ($cpan_file eq $mapped_file) { + if ($cpan_file eq $relative_mapped_file) { print $outfh " Unchanged: $cpan_file\n"; } else { - print $outfh " Unchanged: $cpan_file $mapped_file\n"; + print $outfh " Unchanged: $cpan_file $relative_mapped_file\n"; } } } -- Perl5 Master Repository
