CPAN.pm 1.9205

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

p4raw-id: //depot/perl@32280

diff --git a/lib/CPAN.pm b/lib/CPAN.pm
index 0f54a64..edb8541 100644 (file)
--- a/lib/CPAN.pm
+++ b/lib/CPAN.pm
@@ -1,7 +1,7 @@
 # -*- Mode: cperl; coding: utf-8; cperl-indent-level: 4 -*-
 use strict;
 package CPAN;
-$CPAN::VERSION = '1.9204';
+$CPAN::VERSION = '1.9205';
 $CPAN::VERSION = eval $CPAN::VERSION if $CPAN::VERSION =~ /_/;
 
 use CPAN::HandleConfig;
@@ -359,6 +359,7 @@ ReadLine support %s
     soft_chdir_with_alternatives(\@cwd);
 }
 
+#-> CPAN::soft_chdir_with_alternatives ;
 sub soft_chdir_with_alternatives ($) {
     my($cwd) = @_;
     unless (@$cwd) {
@@ -1997,7 +1998,8 @@ sub o {
     $o_type ||= "";
     CPAN->debug("o_type[$o_type] o_what[".join(" | ",@o_what)."]\n");
     if ($o_type eq 'conf') {
-        my($cfilter) = $o_what[0] =~ m|^/(.*)/$| if @o_what;
+        my($cfilter);
+        ($cfilter) = $o_what[0] =~ m|^/(.*)/$| if @o_what;
         if (!@o_what or $cfilter) { # print all things, "o conf"
             $cfilter ||= "";
             my $qrfilter = eval 'qr/$cfilter/';
@@ -2959,7 +2961,7 @@ that may go away anytime.\n"
             push @m, $obj;
         }
     }
-       @m = sort {$a->id cmp $b->id} @m;
+    @m = sort {$a->id cmp $b->id} @m;
     if ( $CPAN::DEBUG ) {
         my $wantarray = wantarray;
         my $join_m = join ",", map {$_->id} @m;
@@ -8277,11 +8279,11 @@ sub unsat_prereq {
 
             my $do = $nmo->distribution;
             next NEED unless $do; # not on CPAN
-            if (CPAN::Version->vcmp($need_version, $nmo->{CPAN_VERSION}) > 0){
+            if (CPAN::Version->vcmp($need_version, $nmo->ro->{CPAN_VERSION}) > 0){
                 $CPAN::Frontend->mywarn("Warning: Prerequisite ".
                                         "'$need_module => $need_version' ".
                                         "for '$self->{ID}' seems ".
-                                        "not available according the the indexes\n"
+                                        "not available according to the indexes\n"
                                        );
                 next NEED;
             }
@@ -9772,21 +9774,21 @@ sub as_glimpse {
         $color_off = Term::ANSIColor::color("reset");
     }
     my $uptodateness = " ";
-       unless ($class eq "Bundle") {
-               my $u = $self->uptodate;
-               $uptodateness = $u ? "=" : "<" if defined $u;
-       };
-       my $id = do {
-               my $d = $self->distribution;
-               $d ? $d -> pretty_id : $self->cpan_userid;
-       };
+    unless ($class eq "Bundle") {
+        my $u = $self->uptodate;
+        $uptodateness = $u ? "=" : "<" if defined $u;
+    };
+    my $id = do {
+        my $d = $self->distribution;
+        $d ? $d -> pretty_id : $self->cpan_userid;
+    };
     push @m, sprintf("%-7s %1s %s%-22s%s (%s)\n",
                      $class,
                      $uptodateness,
                      $color_on,
                      $self->id,
                      $color_off,
-                                        $id,
+                     $id,
                     );
     join "", @m;
 }
@@ -10135,20 +10137,22 @@ sub test   {
     # $self->{badtestcnt} ||= 0;
     $self->rematein('test',@_);
 }
+
 #-> sub CPAN::Module::uptodate ;
 sub uptodate {
-       my ($self) = @_;
-       local ($_);
-       my $inst = $self->inst_version or return undef;
-       my $cpan = $self->cpan_version;
-       local ($^W) = 0;
-       CPAN::Version->vgt($cpan,$inst) and return 0;
+    my ($self) = @_;
+    local ($_);
+    my $inst = $self->inst_version or return undef;
+    my $cpan = $self->cpan_version;
+    local ($^W) = 0;
+    CPAN::Version->vgt($cpan,$inst) and return 0;
     CPAN->debug(join("",
-               "returning uptodate. inst_file[",
-               $self->inst_file,
-        "cpan[$cpan] inst[$inst]")) if $CPAN::DEBUG;
-       return 1;
+                     "returning uptodate. inst_file[",
+                     $self->inst_file,
+                     "cpan[$cpan] inst[$inst]")) if $CPAN::DEBUG;
+    return 1;
 }
+
 #-> sub CPAN::Module::install ;
 sub install {
     my($self) = @_;

diff --git a/lib/CPAN/SIGNATURE b/lib/CPAN/SIGNATURE
index 1cbce6f..502a4b8 100644 (file)
--- a/lib/CPAN/SIGNATURE
+++ b/lib/CPAN/SIGNATURE
@@ -16,16 +16,16 @@ Hash: SHA1
 
 SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 ChangeLog
 SHA1 9b97524a7a91c815e46b19302a33829d3c26bbbf ChangeLog.old
-SHA1 851d78938b7b73e8c8903bd123cc5b546fe73992 Changes
+SHA1 1f5560debf8047479a56db71944bffd1aa31a87b Changes
 SHA1 a029ffa2f2252bb8914eb658666244710994d256 Changes.old
 SHA1 fb6c52f992a33736f1d13579314c32d3c0a23a60 MANIFEST
 SHA1 aacaafd7230f959560a96c1f1201cac79e12a82b MANIFEST.SKIP
-SHA1 ca3181f6372fc658705c7117f92de049d709c25e META.yml
+SHA1 6a40d57fd1c6fd63cf736bc83cb09d5a6c4a4f94 META.yml
 SHA1 209210c653235282b0cc3b21782d74af0aff9dd7 Makefile.PL
 SHA1 37e858c51409a297ef5d3fb35dc57cd3b57f9a4d PAUSE2003.pub
 SHA1 af016003ad503ed078c5f8254521d13a3e0c494f PAUSE2005.pub
 SHA1 a3941566358617b918e0bb7b5c4c2638f451a9d8 PAUSE2007.pub
-SHA1 fb7fc3e96ed3444ca6763aa93eed815280e739e7 README
+SHA1 7f3ba54e43cc2926ccf53055dd188d7f0996f8ec README
 SHA1 4ff62ecf91dad25adcd2bc21cadf05c0deba8138 SlayMakefile
 SHA1 efdbcfba85263ab4b27317f508054e00953801ef Todo
 SHA1 9928e72969096af7df7a4e54c284da21b457c47f distroprefs/00.README
@@ -248,7 +248,7 @@ SHA1 c554e43b8fac85b3755e45d7adde3266cea7f3c3 distroprefs/ZEV.Test-Dependencies.
 SHA1 daac7f7627860e2372a3de6ce35e6e9eec80d8d6 distroprefs/ZINCDEV.tk-zinc.yml
 SHA1 efbe8e6882a2caa0d741b113959a706830ab5882 inc/Test/Builder.pm
 SHA1 ae1d68262bedc2475e2c6fd478d99b259b4fb109 inc/Test/More.pm
-SHA1 2911692d709ef65236598a8dc1d8f3ca8bb0d64d lib/CPAN.pm
+SHA1 76eb94bd72b0682e9cdf6fe55af43ce00cf12659 lib/CPAN.pm
 SHA1 ca47203e0e6479e2be6fac33069ea2cd09d463ec lib/CPAN/API/HOWTO.pm
 SHA1 31fe6809bca43dc74f54ecf6a6ace8706b5ed226 lib/CPAN/Admin.pm
 SHA1 bd870cb6095040f0563eef2ec539867708a4ea37 lib/CPAN/Debug.pm
@@ -310,7 +310,7 @@ SHA1 0a491a470d709dacb6ce098f940ae6dfec646b3a t/yaml_code.yml
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFHL6aU7IA58KMXwV0RApY+AJ9AUpS0zM4Th2nvQY5wL/D/7ms/MwCbBBwc
-I9F91VC3BCpjNaTCVTyu33Y=
-=LRhe
+iD8DBQFHN0sj7IA58KMXwV0RAjdiAJ4yTM7TFVl4A4M4G29MZh9+r9ZXaQCgiDea
+bOVqbVE5L49mibojlmuIpHg=
+=UQM1
 -----END PGP SIGNATURE-----