Upgrade CPAN from 2.09-TRIAL to 2.10.

5 files changed, 10 insertions, 17 deletions

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index c2cb806478..599af4face 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -243,7 +243,7 @@ use File::Glob qw(:case);
     },
 
     'CPAN' => {
-        'DISTRIBUTION' => 'ANDK/CPAN-2.09-TRIAL.tar.gz',
+        'DISTRIBUTION' => 'ANDK/CPAN-2.10.tar.gz',
         'FILES'        => q[cpan/CPAN],
         'EXCLUDED'     => [
             qr{^distroprefs/},
@@ -278,12 +278,6 @@ use File::Glob qw(:case);
                 t/yaml_code.yml
                 ),
         ],
-        # Waiting to be merged upstream: see pull request #85
-        'CUSTOMIZED'   => [
-            qw( lib/CPAN/HandleConfig.pm
-                lib/CPAN/Module.pm
-                ),
-        ],
     },
 
     # Note: When updating CPAN-Meta the META.* files will need to be regenerated
diff --git a/cpan/CPAN/lib/CPAN.pm b/cpan/CPAN/lib/CPAN.pm
index db9deafd13..93ad482a61 100644
--- a/cpan/CPAN/lib/CPAN.pm
+++ b/cpan/CPAN/lib/CPAN.pm
@@ -2,7 +2,7 @@
 # vim: ts=4 sts=4 sw=4:
 use strict;
 package CPAN;
-$CPAN::VERSION = '2.09';
+$CPAN::VERSION = '2.10';
 $CPAN::VERSION =~ s/_//;
 
 # we need to run chdir all over and we would get at wrong libraries
diff --git a/cpan/CPAN/lib/CPAN/Distribution.pm b/cpan/CPAN/lib/CPAN/Distribution.pm
index b2fccc2edf..092b781ac2 100644
--- a/cpan/CPAN/lib/CPAN/Distribution.pm
+++ b/cpan/CPAN/lib/CPAN/Distribution.pm
@@ -8,7 +8,7 @@ use CPAN::InfoObj;
 use File::Path ();
 @CPAN::Distribution::ISA = qw(CPAN::InfoObj);
 use vars qw($VERSION);
-$VERSION = "2.03";
+$VERSION = "2.04";
 
 # no prepare, because prepare is not a command on the shell command line
 # TODO: clear instance cache on reload
@@ -2164,10 +2164,10 @@ is part of the perl-%s distribution. To install that, you need to run
 
     my %env;
     while (my($k,$v) = each %ENV) {
-        next unless defined $v;
-        $env{$k} = $v;
+        next if defined $v;
+        $env{$k} = '';
     }
-    local %ENV = %env;
+    local @ENV{keys %env} = values %env;
     my $satisfied = eval { $self->satisfy_requires };
     return $self->goodbye($@) if $@;
     return unless $satisfied ;
@@ -3204,8 +3204,9 @@ sub prereq_pm {
         return;
     }
     # no Makefile/Build means configuration aborted, so don't look for prereqs
-    return unless   -f File::Spec->catfile($self->{build_dir},'Makefile')
-                ||  -f File::Spec->catfile($self->{build_dir},'Build');
+    my $makefile  = File::Spec->catfile($self->{build_dir}, $^O eq 'VMS' ? 'descrip.mms' : 'Makefile');
+    my $buildfile = File::Spec->catfile($self->{build_dir}, $^O eq 'VMS' ? 'Build.com' : 'Build');
+    return unless   -f $makefile || -f $buildfile;
     CPAN->debug(sprintf "writemakefile[%s]modulebuild[%s]",
                 $self->{writemakefile}||"",
                 $self->{modulebuild}||"",
diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index 822281ed6f..3ee843203b 100644
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -130,7 +130,7 @@ Deparse C<$#_> as that instead of as C<$#{_}>.  [perl #123947]
 
 =item *
 
-L<CPAN> has been upgraded from version 2.05 to 2.09-TRIAL.
+L<CPAN> has been upgraded from version 2.05 to 2.10.
 
 =over 4
 
diff --git a/t/porting/customized.dat b/t/porting/customized.dat
index 0bb141706a..0a9ad1c069 100644
--- a/t/porting/customized.dat
+++ b/t/porting/customized.dat
@@ -1,5 +1,3 @@
-CPAN cpan/CPAN/lib/CPAN/HandleConfig.pm 6cb07139b6ce5c45dc6c8de017583e4eddcaedfe
-CPAN cpan/CPAN/lib/CPAN/Module.pm 7d12bb547f7a268a90c6f8320f439a2dc805b850
 Encode cpan/Encode/encoding.pm baa25e197ba4d5fa228dbf7b440afb5ae18ec5ed
 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/pm_to_blib.t 71ebcee355691ce374fcad251b12d8b2412462b3
 PerlIO::via::QuotedPrint cpan/PerlIO-via-QuotedPrint/t/QuotedPrint.t ca39f0146e89de02c746e199c45dcb3e5edad691