Upgrade CPANPLUS to 0.9120

5 files changed, 60 insertions, 10 deletions

diff --git a/cpan/CPANPLUS/lib/CPANPLUS.pm b/cpan/CPANPLUS/lib/CPANPLUS.pm
index 3367aed23c..5297487e61 100644
--- a/cpan/CPANPLUS/lib/CPANPLUS.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS.pm
@@ -13,7 +13,7 @@ BEGIN {
     use vars        qw( @EXPORT @ISA $VERSION );
     @EXPORT     =   qw( shell fetch get install );
     @ISA        =   qw( Exporter );
-    $VERSION = "0.9118";     #have to hardcode or cpan.org gets unhappy
+    $VERSION = "0.9120";     #have to hardcode or cpan.org gets unhappy
 }
 
 ### purely for backward compatibility, so we can call it from the commandline:
diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm
index a0fa443a7b..3dde367bda 100644
--- a/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm
@@ -42,7 +42,7 @@ use vars qw[@ISA $VERSION];
             CPANPLUS::Internals::Report
         ];
 
-$VERSION = "0.9118";
+$VERSION = "0.9120";
 
 =pod
 
diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Report.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Report.pm
index 24d4c62b59..6e3cd5641d 100644
--- a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Report.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Report.pm
@@ -509,12 +509,13 @@ sub _send_report {
         $message .= REPORT_TESTS_SKIPPED->();
     } elsif( $grade eq GRADE_NA) {
 
+        my $capture = ( $status && defined $status->{capture} ? $status->{capture} : $buffer );
+
         ### add the reason for the NA to the buffer
-        $buffer = join $/, $buffer, map {
+        $capture = join $/, $capture, map {
                         '[' . $_->tag . '] [' . $_->when . '] ' .
                         $_->message } ( CPANPLUS::Error->stack )[-1];
 
-        my $capture = ( $status && defined $status->{capture} ? $status->{capture} : $buffer );
         ### the bit where we inform what went wrong
         $message .= REPORT_MESSAGE_FAIL_HEADER->( $stage, $capture );
 
diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Source.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Source.pm
index 85e1bd2ca8..1f75535fa6 100644
--- a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Source.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Source.pm
@@ -549,6 +549,16 @@ sub __create_author_tree {
     ### don't need it anymore ###
     unlink $out;
 
+    my ($tot,$prce,$prc,$idx);
+
+    $args->{verbose}
+   and local $|=1,
+       $tot = scalar(split /\n/, $cont),
+       ($prce, $prc, $idx) = (int $tot / 25, 0, 0);
+
+    $args->{verbose}
+   and print "\t0%";
+
     for ( split /\n/, $cont ) {
         my($id, $name, $email) = m/^alias \s+
                                     (\S+) \s+
@@ -561,8 +571,24 @@ sub __create_author_tree {
             cpanid  => $id,             #authors CPAN ID
         ) or error( loc("Could not add author '%1'", $name ) );
 
+   $args->{verbose}
+       and (
+          $idx++,
+
+          ($idx==$prce
+         and ($prc+=4,$idx=0,print ".")),
+
+              (($prc % 10)
+              or $idx
+              or print $prc,'%')
+      );
+
     }
 
+    $args->{verbose}
+   and print "\n";
+
+
     return $self->_atree;
 
 } #__create_author_tree
@@ -636,9 +662,17 @@ sub _create_mod_tree {
     ### don't need it anymore ###
     unlink $out;
 
-    my($past_header, $count);
-    for ( split /\n/, $content ) {
+    my($past_header, $count, $tot, $prce, $prc, $idx);
+
+    $args->{verbose}
+   and local $|=1,
+       $tot = scalar(split /\n/, $content),
+       ($prce, $prc, $idx) = (int $tot / 25, 0, 0);
 
+    $args->{verbose}
+   and print "\t0%";
+
+    for ( split /\n/, $content ) {
         ### quick hack to read past the header of the file ###
         ### this is still rather evil... fix some time - Kane
         if( m|^\s*$| ) {
@@ -730,8 +764,23 @@ sub _create_mod_tree {
             mtime       => '',
         ) or error( loc( "Could not add module '%1'", $data[0] ) );
 
+   $args->{verbose}
+       and (
+          $idx++,
+
+          ($idx==$prce
+         and ($prc+=4,$idx=0,print ".")),
+
+              (($prc % 10)
+              or $idx
+              or print $prc,'%')
+      );
+
     } #for
 
+    $args->{verbose}
+   and print "\n";
+
     return $self->_mtree;
 
 } #_create_mod_tree
@@ -822,9 +871,9 @@ sub __create_dslip_tree {
     ### use this regex to make sure dslips with ';' in them don't cause
     ### parser errors
     my ($ds_one, $ds_two) = ($in =~ m|.+}\s+
-										(\$(?:CPAN::Modulelist::)?cols.*?)
-										(\$(?:CPAN::Modulelist::)?data.*)
-									|sx);
+                              (\$(?:CPAN::Modulelist::)?cols.*?)
+                              (\$(?:CPAN::Modulelist::)?data.*)
+                           |sx);
 
     ### eval them into existence ###
     ### still not too fond of this solution - kane ###
diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm b/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm
index 6a53391a04..04e9775341 100644
--- a/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm
@@ -26,7 +26,7 @@ local $Data::Dumper::Indent     = 1; # for dumpering from !
 BEGIN {
     use vars        qw[ $VERSION @ISA ];
     @ISA        =   qw[ CPANPLUS::Shell::_Base::ReadLine ];
-    $VERSION = "0.9118";
+    $VERSION = "0.9120";
 }
 
 load CPANPLUS::Shell;