Upgrade CPAN from 2.04-TRIAL to 2.05-TRIAL
authorSteve Hay <steve.m.hay@googlemail.com>
Thu, 10 Apr 2014 13:53:00 +0000 (14:53 +0100)
committerSteve Hay <steve.m.hay@googlemail.com>
Thu, 10 Apr 2014 13:53:00 +0000 (14:53 +0100)
Porting/Maintainers.pl
cpan/CPAN/lib/CPAN.pm
cpan/CPAN/lib/CPAN/Distribution.pm
cpan/CPAN/lib/CPAN/FirstTime.pm
cpan/CPAN/lib/CPAN/Shell.pm
pod/perldelta.pod

index 31d821c..43e0d01 100755 (executable)
@@ -252,12 +252,13 @@ use File::Glob qw(:case);
     },
 
     'CPAN' => {
-        'DISTRIBUTION' => 'ANDK/CPAN-2.04-TRIAL.tar.gz',
+        'DISTRIBUTION' => 'ANDK/CPAN-2.05-TRIAL.tar.gz',
         'FILES'        => q[cpan/CPAN],
         'EXCLUDED'     => [
             qr{^distroprefs/},
             qr{^inc/Test/},
-            qr{^t/CPAN/authors/},
+            qr{^t/CPAN/},
+            qr{^t/data/},
             qw( lib/CPAN/Admin.pm
                 scripts/cpan-mirrors
                 PAUSE2015.pub
@@ -272,26 +273,14 @@ use File::Glob qw(:case);
                 t/31sessions.t
                 t/41distribution.t
                 t/42distroprefs.t
-                t/44cpanmeta.t
                 t/43distroprefspref.t
+                t/44cpanmeta.t
                 t/50pod.t
                 t/51pod.t
                 t/52podcover.t
                 t/60credentials.t
                 t/70_critic.t
                 t/71_minimumversion.t
-                t/CPAN/CpanTestDummies-1.55.pm
-                t/CPAN/TestConfig.pm
-                t/CPAN/TestMirroredBy
-                t/CPAN/TestPatch.txt
-                t/CPAN/modules/02packages.details.txt
-                t/CPAN/modules/03modlist.data
-                t/data/META-dynamic.json
-                t/data/META-dynamic.yml
-                t/data/META-static.json
-                t/data/META-static.yml
-                t/data/MYMETA.json
-                t/data/MYMETA.yml
                 t/local_utils.pm
                 t/perlcriticrc
                 t/yaml_code.yml
index 6d7cff9..ace2b11 100644 (file)
@@ -2,7 +2,7 @@
 # vim: ts=4 sts=4 sw=4:
 use strict;
 package CPAN;
-$CPAN::VERSION = '2.04';
+$CPAN::VERSION = '2.05';
 $CPAN::VERSION =~ s/_//;
 
 # we need to run chdir all over and we would get at wrong libraries
@@ -3794,8 +3794,9 @@ Speaking of the build directory. Do I have to clean it up myself?
 You have the choice to set the config variable C<scan_cache> to
 C<never>. Then you must clean it up yourself. The other possible
 values, C<atstart> and C<atexit> clean up the build directory when you
-start or exit the CPAN shell, respectively. If you never start up the
-CPAN shell, you probably also have to clean up the build directory
+start (or more precisely, after the first extraction into the build
+directory) or exit the CPAN shell, respectively. If you never start up
+the CPAN shell, you probably also have to clean up the build directory
 yourself.
 
 =back
index 9320c78..9a08707 100644 (file)
@@ -9,7 +9,7 @@ use CPAN::InfoObj;
 use File::Path ();
 @CPAN::Distribution::ISA = qw(CPAN::InfoObj);
 use vars qw($VERSION);
-$VERSION = "2.01";
+$VERSION = "2.02";
 
 # Accessors
 sub cpan_comment {
@@ -3311,11 +3311,6 @@ sub prereq_pm {
 sub shortcut_test {
     my ($self) = @_;
 
-    $self->debug("checking notest[$self->{ID}]") if $CPAN::DEBUG;
-    if ($self->{notest}) {
-        return $self->success("Skipping test because of notest pragma");
-    }
-
     $self->debug("checking badtestcnt[$self->{ID}]") if $CPAN::DEBUG;
     $self->{badtestcnt} ||= 0;
     if ($self->{badtestcnt} > 0) {
@@ -3354,6 +3349,11 @@ sub shortcut_test {
         }
     }
 
+    if ($self->{notest}) {
+        $self->{make_test} = CPAN::Distrostatus->new("YES");
+        return $self->success("Skipping test because of notest pragma");
+    }
+
     return undef; # no shortcut
 }
 
index 0998ff6..d1a8eef 100644 (file)
@@ -10,7 +10,7 @@ use File::Path ();
 use File::Spec ();
 use CPAN::Mirrors ();
 use vars qw($VERSION $auto_config);
-$VERSION = "5.5305";
+$VERSION = "5.5306";
 
 =head1 NAME
 
@@ -1333,10 +1333,6 @@ sub init {
 sub _local_lib_config {
     # Set environment stuff for this process
     require local::lib;
-    my %env = local::lib->build_environment_vars_for(_local_lib_path(), 1);
-    while ( my ($k, $v) = each %env ) {
-        $ENV{$k} = $v;
-    }
 
     # Tell user about environment vars to set
     $CPAN::Frontend->myprint($prompts{local_lib_installed});
@@ -1344,6 +1340,12 @@ sub _local_lib_config {
     my $shellvars = local::lib->environment_vars_string_for(_local_lib_path());
     $CPAN::Frontend->myprint($shellvars);
 
+    # Set %ENV after getting string above
+    my %env = local::lib->build_environment_vars_for(_local_lib_path(), 1);
+    while ( my ($k, $v) = each %env ) {
+        $ENV{$k} = $v;
+    }
+
     # Offer to mangle the shell config
     my $munged_rc;
     if ( my $rc = _find_shell_config() ) {
index a5cec99..9e0bb14 100644 (file)
@@ -47,7 +47,7 @@ use vars qw(
              "CPAN/Tarzip.pm",
              "CPAN/Version.pm",
             );
-$VERSION = "5.5003";
+$VERSION = "5.5004";
 # record the initial timestamp for reload.
 $reload = { map {$INC{$_} ? ($_,(stat $INC{$_})[9]) : ()} @relo };
 @CPAN::Shell::ISA = qw(CPAN::Debug);
@@ -1814,6 +1814,7 @@ sub unrecoverable_error {
 
 #-> sub CPAN::Shell::mysleep ;
 sub mysleep {
+    return if $ENV{AUTOMATED_TESTING} || ! -t STDOUT;
     my($self, $sleep) = @_;
     if (CPAN->has_inst("Time::HiRes")) {
         Time::HiRes::sleep($sleep);
index fa258ad..f67bb2c 100644 (file)
@@ -133,7 +133,13 @@ keep in sync with the latest CPAN release.
 
 =item *
 
-L<DB> has been upgraded from 1.43 to 1.44.
+L<CPAN> has been upgraded from version 2.04-TRIAL to 2.05-TRIAL.
+
+TODO
+
+=item *
+
+L<DB> has been upgraded from version 1.43 to 1.44.
 
 The debugger now correctly restores its input and output filehandles after
 using the pager command.