[PAUSE] CPAN Upload: A/AN/ANDK/CPAN-1.81.tar.gz

Message-ID: <87u0cm433s.fsf@k75.linux.bogus>

p4raw-id: //depot/perl@26592

2 files changed, 29 insertions, 6 deletions

diff --git a/lib/CPAN.pm b/lib/CPAN.pm
index 200786b775..0d23bacc1b 100644
--- a/lib/CPAN.pm
+++ b/lib/CPAN.pm
@@ -1,6 +1,6 @@
 # -*- Mode: cperl; coding: utf-8; cperl-indent-level: 4 -*-
 package CPAN;
-$VERSION = '1.80_58';
+$VERSION = '1.81';
 $VERSION = eval $VERSION;
 use strict;
 
@@ -3025,7 +3025,7 @@ sub cpl_option {
     } elsif ($words[1] eq 'conf') {
 	return CPAN::HandleConfig::cpl(@_);
     } elsif ($words[1] eq 'debug') {
-	return sort grep /^\Q$word\E/,
+	return sort grep /^\Q$word\E/i,
             sort keys %CPAN::DEBUG, 'all';
     }
 }
@@ -3764,13 +3764,18 @@ package CPAN::Distribution;
 use strict;
 
 # Accessors
-sub cpan_comment { shift->ro->{CPAN_COMMENT} }
+sub cpan_comment {
+    my $self = shift;
+    my $ro = $self->ro or return;
+    $ro->{CPAN_COMMENT}
+}
 
 sub undelay {
     my $self = shift;
     delete $self->{later};
 }
 
+# add the A/AN/ stuff
 # CPAN::Distribution::normalize
 sub normalize {
     my($self,$s) = @_;
@@ -3788,6 +3793,13 @@ sub normalize {
     $s;
 }
 
+sub pretty_id {
+    my $self = shift;
+    my $id = $self->id;
+    return $id unless $id =~ m|^./../|;
+    substr($id,5);
+}
+
 # mark as dirty/clean
 #-> sub CPAN::Distribution::color_cmd_tmps ;
 sub color_cmd_tmps {
@@ -4060,10 +4072,17 @@ sub get {
                                                               )->as_string
                                         );
 
-                my $wrap = qq{I\'d recommend removing $self->{localfile}. Its signature
+                my $wrap =
+                    sprintf(qq{I\'d recommend removing %s. Its signature
 is invalid. Maybe you have configured your 'urllist' with
 a bad URL. Please check this array with 'o conf urllist', and
-retry.};
+retry. For more information, try opening a subshell with
+  look %s
+and there run
+  cpansign -v},
+                            $self->{localfile},
+                            $self->pretty_id,
+                           );
                 $CPAN::Frontend->mydie(Text::Wrap::wrap("","",$wrap));
             }
         } else {
diff --git a/lib/CPAN/FirstTime.pm b/lib/CPAN/FirstTime.pm
index 1ffb01f792..de860d5f2a 100644
--- a/lib/CPAN/FirstTime.pm
+++ b/lib/CPAN/FirstTime.pm
@@ -19,7 +19,7 @@ use File::Basename ();
 use File::Path ();
 use File::Spec;
 use vars qw($VERSION);
-$VERSION = sprintf "%.2f", substr(q$Rev: 286 $,4)/100;
+$VERSION = sprintf "%.2f", substr(q$Rev: 331 $,4)/100;
 
 =head1 NAME
 
@@ -432,6 +432,8 @@ Your choice: ",$default);
 	prompt("Do you want to use a different make command for 'make install'?
 Cautious people will probably prefer:
 
+    su root -c make
+or
     sudo make
 or
     /path1/to/sudo -u admin_account /path2/to/make
@@ -478,6 +480,8 @@ Your choice: ",$default);
 	prompt("Do you want to use a different command for './Build install'?
 Sudo users will probably prefer:
 
+    su root -c ./Build
+or
     sudo ./Build
 or
     /path1/to/sudo -u admin_account ./Build