Upgrade to CPAN-1.88_53.

p4raw-id: //depot/perl@28986

3 files changed, 30 insertions, 24 deletions

diff --git a/lib/CPAN/HandleConfig.pm b/lib/CPAN/HandleConfig.pm
index a755254fa6..557aac5fed 100644
--- a/lib/CPAN/HandleConfig.pm
+++ b/lib/CPAN/HandleConfig.pm
@@ -2,7 +2,7 @@ package CPAN::HandleConfig;
 use strict;
 use vars qw(%can %keys $VERSION);
 
-$VERSION = sprintf "%.6f", substr(q$Rev: 958 $,4)/1000000 + 5.4;
+$VERSION = sprintf "%.6f", substr(q$Rev: 984 $,4)/1000000 + 5.4;
 
 %can = (
         commit   => "Commit changes to disk",
@@ -282,7 +282,7 @@ sub defaults {
     my $done;
     for my $config (qw(CPAN/MyConfig.pm CPAN/Config.pm)) {
         if ($INC{$config}) {
-            CPAN::Shell->reload_this($config);
+            CPAN::Shell->reload_this($config,{force => 1});
             $CPAN::Frontend->myprint("'$INC{$config}' reread\n");
             last;
         }
@@ -581,12 +581,12 @@ package
 
 use strict;
 use vars qw($AUTOLOAD $VERSION);
-$VERSION = sprintf "%.2f", substr(q$Rev: 958 $,4)/100;
+$VERSION = sprintf "%.2f", substr(q$Rev: 984 $,4)/100;
 
 # formerly CPAN::HandleConfig was known as CPAN::Config
 sub AUTOLOAD {
   my($l) = $AUTOLOAD;
-  $CPAN::Frontend->mywarn("Dispatching deprecated method '$l' to CPAN::HandleConfig");
+  $CPAN::Frontend->mywarn("Dispatching deprecated method '$l' to CPAN::HandleConfig\n");
   $l =~ s/.*:://;
   CPAN::HandleConfig->$l(@_);
 }
diff --git a/lib/CPAN/Queue.pm b/lib/CPAN/Queue.pm
index 0087b0ce69..7cbff383a5 100644
--- a/lib/CPAN/Queue.pm
+++ b/lib/CPAN/Queue.pm
@@ -48,7 +48,7 @@ use strict;
 # Hope that makes sense, my head is a bit off:-) -- AK
 
 use vars qw{ @All $VERSION };
-$VERSION = sprintf "%.6f", substr(q$Rev: 922 $,4)/1000000 + 5.4;
+$VERSION = sprintf "%.6f", substr(q$Rev: 979 $,4)/1000000 + 5.4;
 
 # CPAN::Queue::new ;
 sub new {
@@ -98,6 +98,11 @@ sub jumpqueue {
                         join("",map {sprintf " %s\[%s]\n",$_->{qmod},$_->{reqtype}} @All),
                         join("",map {sprintf " %s\[%s]",$_->[0],$_->[1]} @what)
                        )) if $CPAN::DEBUG;
+    unless (defined $what[0][1]) {
+        # apparently it was not the Shell that sent us this enquiry,
+        # treat it as commandline
+        $what[0][1] = "c";
+     }
     my $inherit_reqtype = $what[0][1] =~ /^(c|r)$/ ? "r" : "b";
   WHAT: for my $what_tuple (@what) {
         my($what,$reqtype) = @$what_tuple;
diff --git a/lib/CPAN/SIGNATURE b/lib/CPAN/SIGNATURE
index d7447f1516..2378ce0611 100644
--- a/lib/CPAN/SIGNATURE
+++ b/lib/CPAN/SIGNATURE
@@ -14,27 +14,27 @@ not run its Makefile.PL or Build.PL.
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-SHA1 6b31a7d5e222880c5d1f3b52758d46ed186e9784 ChangeLog
+SHA1 615a0770e25c66c7ea0ab28d856f68fd44a804e5 ChangeLog
 SHA1 9b97524a7a91c815e46b19302a33829d3c26bbbf ChangeLog.old
-SHA1 d07abcd12ef7ee717592607dadd79fc64ab0cd15 Changes
+SHA1 dedf79cf37a65e0cf39c868baab61345fafe3009 Changes
 SHA1 a029ffa2f2252bb8914eb658666244710994d256 Changes.old
-SHA1 bcac708d887442591ac400c72a6be0629f416434 MANIFEST
-SHA1 159c257eb8d294fa6e0612fda7edcad948ab0362 MANIFEST.SKIP
-SHA1 41f58cb5008281bb0d6954a4131e1301f084d980 META.yml
-SHA1 f428cf9c8f7206fe115a1f42e13da5999452d075 Makefile.PL
+SHA1 ee8bd2cd2dfb8c4c6d22356e75fa4bc142818888 MANIFEST
+SHA1 fb3d28505ba410871467e5c86024ee96658b99d8 MANIFEST.SKIP
+SHA1 9bcd203e50b0279420b9074cb63a558f93ea928a META.yml
+SHA1 78ba89cb99753ada11899f82021c8dd0769baeb4 Makefile.PL
 SHA1 37e858c51409a297ef5d3fb35dc57cd3b57f9a4d PAUSE2003.pub
 SHA1 af016003ad503ed078c5f8254521d13a3e0c494f PAUSE2005.pub
 SHA1 07fc8068a27f362219008d279729e96eb5fe9d89 README
-SHA1 76a7fd2eaec46c78f269da06766dc76b974b7339 Todo
+SHA1 c049ef27c30df077fb0292fb523a430716daa1c3 Todo
 SHA1 efbe8e6882a2caa0d741b113959a706830ab5882 inc/Test/Builder.pm
 SHA1 ae1d68262bedc2475e2c6fd478d99b259b4fb109 inc/Test/More.pm
-SHA1 a6a24e27778fcc9dfb12c190e6369cfbd001f25b lib/CPAN.pm
+SHA1 d9c63de192370f85c40b557375086a9566099d20 lib/CPAN.pm
 SHA1 e093af1fcd72420fe4bdc85a5bec2b92a301ab97 lib/CPAN/Admin.pm
 SHA1 aa9e4d9384c88c55f9f457e2c2123242d7989406 lib/CPAN/Debug.pm
 SHA1 9af992904cb4445c306ecf8f7675478865f66c1e lib/CPAN/FirstTime.pm
-SHA1 c1170925e60ffcc14025b975997930a5f3eb6f7b lib/CPAN/HandleConfig.pm
+SHA1 b9aee0537dfde5bf86f01535adcfd5bed6f78cbf lib/CPAN/HandleConfig.pm
 SHA1 17a1ad839531642ace9bf198bf52964c252f3318 lib/CPAN/Nox.pm
-SHA1 4992722f9e21d4c8f450cf96887b1e82f628b66c lib/CPAN/Queue.pm
+SHA1 caeaa439558a19b64119321aa9105980928862f5 lib/CPAN/Queue.pm
 SHA1 fc6de4175a275a4c6791091f2ffcee2636a4a0f2 lib/CPAN/Tarzip.pm
 SHA1 9498e9ed9da55227715a049692677b75e825adca lib/CPAN/Version.pm
 SHA1 fb08e07d8740ef36e8ab719c6a9b7e89c4fe674a scripts/cpan
@@ -46,7 +46,7 @@ SHA1 18368a653b17c7166f43686f8e315fd5e88bbcfa t/10version.t
 SHA1 325d8a2f72d59c4cd2400c72403c05cd614c3abc t/11mirroredby.t
 SHA1 7696ade95e8c4943a3e3e6a13c03c450cec8d030 t/12cpan.t
 SHA1 fa075e989a5923e73684d13d5e94baa0711bb360 t/30shell.coverage
-SHA1 3d2f626c0a5c86bd0c3fa61aece5ee2700554758 t/30shell.t
+SHA1 417e435c2deca1aa33142b4f45c135a1f61855dd t/30shell.t
 SHA1 6a79f15a10337bd3450604abf39d4462df2a550b t/50pod.t
 SHA1 6c194eb30cce245737fe5e1a35118ed78abae0d1 t/51pod.t
 SHA1 c98f4c2aa680bb0e88569f6ab4a9ca4e8deb5c1e t/52podcover.t
@@ -55,24 +55,25 @@ SHA1 7efe930efd0a07d8101679ed15d4700dcf208137 t/CPAN/CpanTestDummies-1.55.pm
 SHA1 310b5562df76ff28ab05d741e144d84fb5b5369b t/CPAN/TestConfig.pm
 SHA1 081ed556ae14a75c43ca31e67cfc99d180c9ef41 t/CPAN/TestMirroredBy
 SHA1 b4fd27234696da334ac6a1716222c70610a98c3a t/CPAN/authors/01mailrc.txt
-SHA1 fa94efff2de87bf316ff21c2f972355d2d966b0c t/CPAN/authors/id/A/AN/ANDK/CHECKSUMS
+SHA1 957c072e4be15cf3853789558de72f45fd36c2dd t/CPAN/authors/id/A/AN/ANDK/CHECKSUMS
 SHA1 d1a101f24d2d0719c9991df28ede729d58005bb4 t/CPAN/authors/id/A/AN/ANDK/CHECKSUMS@588
-SHA1 f02f801c427f4efa21a7a86433aa0d4a8a45e35d t/CPAN/authors/id/A/AN/ANDK/CPAN-Test-Dummy-Perl5-Build-1.02.tar.gz
-SHA1 11f35aa730e452797f5d7371a393e24e40ea8d21 t/CPAN/authors/id/A/AN/ANDK/CPAN-Test-Dummy-Perl5-Build-Fails-1.01.tar.gz
+SHA1 34cf1bf9c95007fe02a4b4f4977eb017516b0cdc t/CPAN/authors/id/A/AN/ANDK/CPAN-Test-Dummy-Perl5-Build-1.03.tar.gz
+SHA1 7b340bac6eab5d3cf00054185f7b69cca600a76b t/CPAN/authors/id/A/AN/ANDK/CPAN-Test-Dummy-Perl5-Build-DepeFails-1.01.tar.gz
+SHA1 ec68bb3a9f0993b301e25fb04b0e03f67474fb7e t/CPAN/authors/id/A/AN/ANDK/CPAN-Test-Dummy-Perl5-Build-Fails-1.02.tar.gz
 SHA1 c0587c6180bd979acfa2b2396688208793366ff5 t/CPAN/authors/id/A/AN/ANDK/CPAN-Test-Dummy-Perl5-BuildOrMake-1.01.tar.gz
-SHA1 ab7949c878bee53584fcaa280ce7e173bcccd55e t/CPAN/authors/id/A/AN/ANDK/CPAN-Test-Dummy-Perl5-Make-1.03.tar.gz
+SHA1 312bcda6aa730093c45bcc08ef8595652b6e179e t/CPAN/authors/id/A/AN/ANDK/CPAN-Test-Dummy-Perl5-Make-1.04.tar.gz
 SHA1 3dc672ec2542810513b26e306a6545bfee069654 t/CPAN/authors/id/A/AN/ANDK/CPAN-Test-Dummy-Perl5-Make-Failearly-1.01.tar.gz
 SHA1 ebf211b8f5907f9f008abbc756cb0b5a962b9395 t/CPAN/authors/id/A/AN/ANDK/CPAN-Test-Dummy-Perl5-Make-Zip-1.02.zip
 SHA1 541ac9311d4dbabe9bb99d770b221456798be688 t/CPAN/authors/id/A/AN/ANDK/NotInChecksums-0.000.tar.gz
 SHA1 1aee1bed21f0e9755d693419e810ec75543eb0b7 t/CPAN/authors/id/A/AN/CHECKSUMS
 SHA1 1f3304f219bf0da4db6a60f638e11b61c2c2f4c0 t/CPAN/authors/id/A/CHECKSUMS
 SHA1 dfc900f5bfbc9683fa91977a1c7198222fbd4452 t/CPAN/authors/id/CHECKSUMS
-SHA1 f73a986b44f38e126e4c8a50289d5537d80581e8 t/CPAN/modules/02packages.details.txt
+SHA1 b0d72edf855ecb3a47c4e73a3b62dd8100f23114 t/CPAN/modules/02packages.details.txt
 SHA1 f4c1a524de16347b37df6427ca01f98dd27f3c81 t/CPAN/modules/03modlist.data
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFIjIj7IA58KMXwV0RAidhAJ9x6UiFYhaKWBORJxsSvnMc6Jno/ACcClyR
-tkNXFaGx9iPcX6f2Xfh4D7A=
-=zuVm
+iD8DBQFFKqKl7IA58KMXwV0RAqwhAKCJEIYlsGcacWTw3yZmgxQPiD/nUwCg1qeg
+JCQO0aOgrEQv5H0Fo9uk//g=
+=ZJnm
 -----END PGP SIGNATURE-----