+++ /dev/null
---- perl-5.6.0/lib/CPAN/FirstTime.pm.wiget Fri Feb 4 09:18:44 2000
-+++ perl-5.6.0/lib/CPAN/FirstTime.pm Sun Oct 8 16:21:01 2000
-@@ -16,7 +16,7 @@
- use File::Basename ();
- use File::Path ();
- use vars qw($VERSION);
--$VERSION = substr q$Revision$, 10;
-+$VERSION = substr q$Revision$, 10;
-
- =head1 NAME
-
-@@ -149,7 +149,7 @@
- print qq{
-
- How big should the disk cache be for keeping the build directories
--with all the intermediate files?
-+with all the intermediate files\?
-
- };
-
-@@ -174,6 +174,20 @@
- } while ($ans ne 'atstart' && $ans ne 'never');
- $CPAN::Config->{scan_cache} = $ans;
-
-+ print qq{
-+
-+To considerably speed up the initial CPAN shell startup, it is
-+possible to use Storable to create a cache of metadata. If Storable
-+is not available, the normal index mechanism will be used.
-+
-+};
-+
-+ defined($default = $CPAN::Config->{cache_metadata}) or $default = 1;
-+ do {
-+ $ans = prompt("Cache metadata (yes/no)?", ($default ? 'yes' : 'no'));
-+ } while ($ans !~ /^\s*[yn]/i);
-+ $CPAN::Config->{cache_metadata} = ($ans =~ /^\s*y/i ? 1 : 0);
-+
- #
- # prerequisites_policy
- # Do we follow PREREQ_PM?
-@@ -188,7 +202,7 @@
-
- };
-
-- $default = $CPAN::Config->{prerequisites_policy} || 'follow';
-+ $default = $CPAN::Config->{prerequisites_policy} || 'ask';
- do {
- $ans =
- prompt("Policy on building prerequisites (follow, ask or ignore)?",
-@@ -361,7 +375,8 @@
- File::Copy::copy($m,$mby) or die "Could not update $mby: $!";
- }
- my $loopcount = 0;
-- while () {
-+ local $^T = time;
-+ while ($mby) {
- if ( ! -f $mby ){
- print qq{You have no $mby
- I\'m trying to fetch one
-@@ -383,6 +398,7 @@
- }
- }
- read_mirrored_by($mby);
-+ bring_your_own();
- }
-
- sub find_exe {
-@@ -424,7 +440,7 @@
- }
-
- sub read_mirrored_by {
-- my($local) = @_;
-+ my $local = shift or return;
- my(%all,$url,$expected_size,$default,$ans,$host,$dst,$country,$continent,@location);
- my $fh = FileHandle->new;
- $fh->open($local) or die "Couldn't open $local: $!";
-@@ -512,25 +528,33 @@
-
- @urls = picklist (\@urls, $prompt, $default);
- foreach (@urls) { s/ \(.*\)//; }
-- %seen = map (($_ => 1), @urls);
-+ push @{$CPAN::Config->{urllist}}, @urls;
-+}
-
-+sub bring_your_own {
-+ my %seen = map (($_ => 1), @{$CPAN::Config->{urllist}});
-+ my($ans,@urls);
- do {
-- $ans = prompt ("Enter another URL or RETURN to quit:", "");
-+ my $prompt = "Enter another URL or RETURN to quit:";
-+ unless (%seen) {
-+ $prompt = qq{CPAN.pm needs at least one URL where it can fetch CPAN files from.
-+
-+Please enter your CPAN site:};
-+ }
-+ $ans = prompt ($prompt, "");
-
- if ($ans) {
-- $ans =~ s|/?$|/|; # has to end with one slash
-+ $ans =~ s|/?\z|/|; # has to end with one slash
- $ans = "file:$ans" unless $ans =~ /:/; # without a scheme is a file:
- if ($ans =~ /^\w+:\/./) {
-- push @urls, $ans
-- unless $seen{$ans};
-- }
-- else {
-+ push @urls, $ans unless $seen{$ans}++;
-+ } else {
- print qq{"$ans" doesn\'t look like an URL at first sight.
- I\'ll ignore it for now. You can add it to $INC{'CPAN/MyConfig.pm'}
- later if you\'re sure it\'s right.\n};
- }
- }
-- } while $ans;
-+ } while $ans || !%seen;
-
- push @{$CPAN::Config->{urllist}}, @urls;
- # xxx delete or comment these out when you're happy that it works
---- perl-5.6.0/lib/CPAN.pm.wiget Thu Mar 2 18:52:52 2000
-+++ perl-5.6.0/lib/CPAN.pm Wed Oct 18 16:48:27 2000
-@@ -1,18 +1,12 @@
-+# -*- Mode: cperl; coding: utf-8; cperl-indent-level: 4 -*-
- package CPAN;
--use vars qw{$Try_autoload
-- $Revision
-- $META $Signal $Cwd $End
-- $Suppress_readline %Dontload
-- $Frontend $Defaultsite
-- }; #};
-+$VERSION = '1.58';
-
--$VERSION = '1.52';
--
--# $Id$
-+# $Id$
-
- # only used during development:
- $Revision = "";
--# $Revision = "[".substr(q$Revision$, 10)."]";
-+# $Revision = "[".substr(q$Revision$, 10)."]";
-
- use Carp ();
- use Config ();
-@@ -29,6 +23,8 @@
- use Text::ParseWords ();
- use Text::Wrap;
- use File::Spec;
-+no lib "."; # we need to run chdir all over and we would get at wrong
-+ # libraries there
-
- END { $End++; &cleanup; }
-
-@@ -47,6 +43,8 @@
- Eval 2048
- Config 4096
- Tarzip 8192
-+ Version 16384
-+ Queue 32768
- ];
-
- $CPAN::DEBUG ||= 0;
-@@ -55,9 +53,12 @@
- $CPAN::Defaultsite ||= "ftp://ftp.perl.org/pub/CPAN";
-
- package CPAN;
--use vars qw($VERSION @EXPORT $AUTOLOAD $DEBUG $META $term);
- use strict qw(vars);
-
-+use vars qw($VERSION @EXPORT $AUTOLOAD $DEBUG $META $HAS_USABLE $term
-+ $Revision $Signal $Cwd $End $Suppress_readline $Frontend
-+ $Defaultsite $Have_warned);
-+
- @CPAN::ISA = qw(CPAN::Debug Exporter);
-
- @EXPORT = qw(
-@@ -75,12 +76,6 @@
- if (exists $EXPORT{$l}){
- CPAN::Shell->$l(@_);
- } else {
-- my $ok = CPAN::Shell->try_dot_al($AUTOLOAD);
-- if ($ok) {
-- goto &$AUTOLOAD;
--# } else {
--# $CPAN::Frontend->mywarn("Could not autoload $AUTOLOAD");
-- }
- $CPAN::Frontend->mywarn(qq{Unknown command "$AUTOLOAD". }.
- qq{Type ? for help.
- });
-@@ -93,6 +88,8 @@
- $Suppress_readline = ! -t STDIN unless defined $Suppress_readline;
- CPAN::Config->load unless $CPAN::Config_loaded++;
-
-+ CPAN::Index->read_metadata_cache;
-+
- my $prompt = "cpan> ";
- local($^W) = 1;
- unless ($Suppress_readline) {
-@@ -121,7 +118,7 @@
- select $odef;
- }
-
-- no strict;
-+ # no strict; # I do not recall why no strict was here (2000-09-03)
- $META->checklock();
- my $getcwd;
- $getcwd = $CPAN::Config->{'getcwd'} || 'cwd';
-@@ -130,14 +127,19 @@
- $try_detect_readline = $term->ReadLine eq "Term::ReadLine::Stub" if $term;
- my $rl_avail = $Suppress_readline ? "suppressed" :
- ($term->ReadLine ne "Term::ReadLine::Stub") ? "enabled" :
-- "available (try ``install Bundle::CPAN'')";
-+ "available (try 'install Bundle::CPAN')";
-
- $CPAN::Frontend->myprint(
-- qq{
--cpan shell -- CPAN exploration and modules installation (v$CPAN::VERSION$CPAN::Revision)
--ReadLine support $rl_avail
-+ sprintf qq{
-+cpan shell -- CPAN exploration and modules installation (v%s%s)
-+ReadLine support %s
-
--}) unless $CPAN::Config->{'inhibit_startup_message'} ;
-+},
-+ $CPAN::VERSION,
-+ $CPAN::Revision,
-+ $rl_avail
-+ )
-+ unless $CPAN::Config->{'inhibit_startup_message'} ;
- my($continuation) = "";
- while () {
- if ($Suppress_readline) {
-@@ -180,7 +182,7 @@
- my $command = shift @line;
- eval { CPAN::Shell->$command(@line) };
- warn $@ if $@;
-- chdir $cwd;
-+ chdir $cwd or $CPAN::Frontend->mydie(qq{Could not chdir to "$cwd": $!});
- $CPAN::Frontend->myprint("\n");
- $continuation = "";
- $prompt = "cpan> ";
-@@ -194,8 +196,8 @@
- $CPAN::META->has_inst("Term::ReadLine::Perl")
- ) {
- delete $INC{"Term/ReadLine.pm"};
-- my $redef;
-- local($SIG{__WARN__}) = CPAN::Shell::dotdot_onreload(\$redef);
-+ my $redef = 0;
-+ local($SIG{__WARN__}) = CPAN::Shell::paintdots_onreload(\$redef);
- require Term::ReadLine;
- $CPAN::Frontend->myprint("\n$redef subroutines in ".
- "Term::ReadLine redefined\n");
-@@ -210,7 +212,6 @@
- use File::Find;
-
- package CPAN::Config;
--import ExtUtils::MakeMaker 'neatvalue';
- use vars qw(%can $dot_cpan);
-
- %can = (
-@@ -231,6 +232,8 @@
- @CPAN::Index::ISA = qw(CPAN::Debug);
- $last_time ||= 0;
- $date_of_03 ||= 0;
-+# use constant PROTOCOL => "2.0"; # outcommented to avoid warning on upgrade from 1.57
-+sub PROTOCOL { 2.0 }
-
- package CPAN::InfoObj;
- @CPAN::InfoObj::ISA = qw(CPAN::Debug);
-@@ -248,7 +251,7 @@
- @CPAN::Module::ISA = qw(CPAN::InfoObj);
-
- package CPAN::Shell;
--use vars qw($AUTOLOAD $redef @ISA);
-+use vars qw($AUTOLOAD @ISA);
- @CPAN::Shell::ISA = qw(CPAN::Debug);
-
- #-> sub CPAN::Shell::AUTOLOAD ;
-@@ -269,86 +272,12 @@
- });
- }
- } else {
-- my $ok = CPAN::Shell->try_dot_al($AUTOLOAD);
-- if ($ok) {
-- goto &$AUTOLOAD;
--# } else {
--# $CPAN::Frontend->mywarn("Could not autoload $autoload");
-- }
- $CPAN::Frontend->mywarn(qq{Unknown command '$autoload'. }.
- qq{Type ? for help.
- });
- }
- }
-
--#-> CPAN::Shell::try_dot_al
--sub try_dot_al {
-- my($class,$autoload) = @_;
-- return unless $CPAN::Try_autoload;
-- # I don't see how to re-use that from the AutoLoader...
-- my($name,$ok);
-- # Braces used to preserve $1 et al.
-- {
-- my ($pkg,$func) = $autoload =~ /(.*)::([^:]+)$/;
-- $pkg =~ s|::|/|g;
-- if (defined($name=$INC{"$pkg.pm"}))
-- {
-- $name =~ s|^(.*)$pkg\.pm\z|$1auto/$pkg/$func.al|s;
-- $name = undef unless (-r $name);
-- }
-- unless (defined $name)
-- {
-- $name = "auto/$autoload.al";
-- $name =~ s|::|/|g;
-- }
-- }
-- my $save = $@;
-- eval {local $SIG{__DIE__};require $name};
-- if ($@) {
-- if (substr($autoload,-9) eq '::DESTROY') {
-- *$autoload = sub {};
-- $ok = 1;
-- } else {
-- if ($name =~ s{(\w{12,})\.al\z}{substr($1,0,11).".al"}e){
-- eval {local $SIG{__DIE__};require $name};
-- }
-- if ($@){
-- $@ =~ s/ at .*\n//;
-- Carp::croak $@;
-- } else {
-- $ok = 1;
-- }
-- }
-- } else {
--
-- $ok = 1;
--
-- }
-- $@ = $save;
--# my $lm = Carp::longmess();
--# warn "ok[$ok] autoload[$autoload] longmess[$lm]"; # debug
-- return $ok;
--}
--
--#### autoloader is experimental
--#### to try it we have to set $Try_autoload and uncomment
--#### the use statement and uncomment the __END__ below
--#### You also need AutoSplit 1.01 available. MakeMaker will
--#### then build CPAN with all the AutoLoad stuff.
--# use AutoLoader;
--# $Try_autoload = 1;
--
--if ($CPAN::Try_autoload) {
-- my $p;
-- for $p (qw(
-- CPAN::Author CPAN::Bundle CPAN::CacheMgr CPAN::Complete
-- CPAN::Config CPAN::Debug CPAN::Distribution CPAN::FTP
-- CPAN::FTP::netrc CPAN::Index CPAN::InfoObj CPAN::Module
-- )) {
-- *{"$p\::AUTOLOAD"} = \&AutoLoader::AUTOLOAD;
-- }
--}
--
- package CPAN::Tarzip;
- use vars qw($AUTOLOAD @ISA);
- @CPAN::Tarzip::ISA = qw(CPAN::Debug);
-@@ -402,70 +331,81 @@
-
- use vars qw{ @All };
-
-+# CPAN::Queue::new ;
- sub new {
-- my($class,$mod) = @_;
-- my $self = bless {mod => $mod}, $class;
-+ my($class,$s) = @_;
-+ my $self = bless { qmod => $s }, $class;
- push @All, $self;
-- # my @all = map { $_->{mod} } @All;
-- # warn "Adding Queue object for mod[$mod] all[@all]";
- return $self;
- }
-
-+# CPAN::Queue::first ;
- sub first {
- my $obj = $All[0];
-- $obj->{mod};
-+ $obj->{qmod};
- }
-
-+# CPAN::Queue::delete_first ;
- sub delete_first {
- my($class,$what) = @_;
- my $i;
- for my $i (0..$#All) {
-- if ( $All[$i]->{mod} eq $what ) {
-+ if ( $All[$i]->{qmod} eq $what ) {
- splice @All, $i, 1;
- return;
- }
- }
- }
-
-+# CPAN::Queue::jumpqueue ;
- sub jumpqueue {
-- my $class = shift;
-- my @what = @_;
-- my $obj;
-+ my $class = shift;
-+ my @what = @_;
-+ CPAN->debug(sprintf("before jumpqueue All[%s] what[%s]",
-+ join(",",map {$_->{qmod}} @All),
-+ join(",",@what)
-+ )) if $CPAN::DEBUG;
- WHAT: for my $what (reverse @what) {
-- my $jumped = 0;
-- for (my $i=0; $i<$#All;$i++) { #prevent deep recursion
-- if ($All[$i]->{mod} eq $what){
-- $jumped++;
-- if ($jumped > 100) { # one's OK if e.g. just processing now;
-- # more are OK if user typed it several
-- # times
-- $CPAN::Frontend->mywarn(
-+ my $jumped = 0;
-+ for (my $i=0; $i<$#All;$i++) { #prevent deep recursion
-+ CPAN->debug("i[$All[$i]]what[$what]") if $CPAN::DEBUG;
-+ if ($All[$i]->{qmod} eq $what){
-+ $jumped++;
-+ if ($jumped > 100) { # one's OK if e.g. just
-+ # processing now; more are OK if
-+ # user typed it several times
-+ $CPAN::Frontend->mywarn(
- qq{Object [$what] queued more than 100 times, ignoring}
- );
-- next WHAT;
-- }
-- }
-+ next WHAT;
-+ }
-+ }
-+ }
-+ my $obj = bless { qmod => $what }, $class;
-+ unshift @All, $obj;
- }
-- my $obj = bless { mod => $what }, $class;
-- unshift @All, $obj;
-- }
-+ CPAN->debug(sprintf("after jumpqueue All[%s] what[%s]",
-+ join(",",map {$_->{qmod}} @All),
-+ join(",",@what)
-+ )) if $CPAN::DEBUG;
- }
-
-+# CPAN::Queue::exists ;
- sub exists {
- my($self,$what) = @_;
-- my @all = map { $_->{mod} } @All;
-- my $exists = grep { $_->{mod} eq $what } @All;
-- # warn "Checking exists in Queue object for mod[$what] all[@all] exists[$exists]";
-+ my @all = map { $_->{qmod} } @All;
-+ my $exists = grep { $_->{qmod} eq $what } @All;
-+ # warn "in exists what[$what] all[@all] exists[$exists]";
- $exists;
- }
-
-+# CPAN::Queue::delete ;
- sub delete {
- my($self,$mod) = @_;
-- @All = grep { $_->{mod} ne $mod } @All;
-- # my @all = map { $_->{mod} } @All;
-- # warn "Deleting Queue object for mod[$mod] all[@all]";
-+ @All = grep { $_->{qmod} ne $mod } @All;
- }
-
-+# CPAN::Queue::nullify_queue ;
- sub nullify_queue {
- @All = ();
- }
-@@ -476,44 +416,31 @@
-
- $META ||= CPAN->new; # In case we re-eval ourselves we need the ||
-
--1;
-+# from here on only subs.
-+################################################################################
-
--# __END__ # uncomment this and AutoSplit version 1.01 will split it
--
--#-> sub CPAN::autobundle ;
--sub autobundle;
--#-> sub CPAN::bundle ;
--sub bundle;
--#-> sub CPAN::expand ;
--sub expand;
--#-> sub CPAN::force ;
--sub force;
--#-> sub CPAN::install ;
--sub install;
--#-> sub CPAN::make ;
--sub make;
--#-> sub CPAN::clean ;
--sub clean;
--#-> sub CPAN::test ;
--sub test;
--
--#-> sub CPAN::all ;
-+#-> sub CPAN::all_objects ;
- sub all_objects {
- my($mgr,$class) = @_;
- CPAN::Config->load unless $CPAN::Config_loaded++;
- CPAN->debug("mgr[$mgr] class[$class]") if $CPAN::DEBUG;
- CPAN::Index->reload;
-- values %{ $META->{$class} };
-+ values %{ $META->{readwrite}{$class} }; # unsafe meta access, ok
- }
- *all = \&all_objects;
-
--# Called by shell, not in batch mode. Not clean XXX
-+# Called by shell, not in batch mode. In batch mode I see no risk in
-+# having many processes updating something as installations are
-+# continually checked at runtime. In shell mode I suspect it is
-+# unintentional to open more than one shell at a time
-+
- #-> sub CPAN::checklock ;
- sub checklock {
- my($self) = @_;
- my $lockfile = MM->catfile($CPAN::Config->{cpan_home},".lock");
- if (-f $lockfile && -M _ > 0) {
-- my $fh = FileHandle->new($lockfile);
-+ my $fh = FileHandle->new($lockfile) or
-+ $CPAN::Frontend->mydie("Could not open $lockfile: $!");
- my $other = <$fh>;
- $fh->close;
- if (defined $other && $other) {
-@@ -545,7 +472,11 @@
- qq{ and then rerun us.\n}
- );
- }
-- }
-+ } else {
-+ $CPAN::Frontend->mydie(sprintf("CPAN.pm panic: Lockfile $lockfile ".
-+ "reports other process with ID ".
-+ "$other. Cannot proceed.\n"));
-+ }
- }
- my $dotcpan = $CPAN::Config->{cpan_home};
- eval { File::Path::mkpath($dotcpan);};
-@@ -610,11 +541,11 @@
- $fh->print($$, "\n");
- $self->{LOCK} = $lockfile;
- $fh->close;
-- $SIG{'TERM'} = sub {
-+ $SIG{TERM} = sub {
- &cleanup;
- $CPAN::Frontend->mydie("Got SIGTERM, leaving");
- };
-- $SIG{'INT'} = sub {
-+ $SIG{INT} = sub {
- # no blocks!!!
- &cleanup if $Signal;
- $CPAN::Frontend->mydie("Got another SIGINT") if $Signal;
-@@ -642,7 +573,8 @@
- #
- # Larry
-
-- $SIG{'__DIE__'} = \&cleanup;
-+ # global backstop to cleanup if we should really die
-+ $SIG{__DIE__} = \&cleanup;
- $self->debug("Signal handler set.") if $CPAN::DEBUG;
- }
-
-@@ -663,13 +595,51 @@
- CPAN::Index->reload;
- ### Carp::croak "exists called without class argument" unless $class;
- $id ||= "";
-- exists $META->{$class}{$id};
-+ exists $META->{readonly}{$class}{$id} or
-+ exists $META->{readwrite}{$class}{$id}; # unsafe meta access, ok
- }
-
- #-> sub CPAN::delete ;
- sub delete {
- my($mgr,$class,$id) = @_;
-- delete $META->{$class}{$id};
-+ delete $META->{readonly}{$class}{$id}; # unsafe meta access, ok
-+ delete $META->{readwrite}{$class}{$id}; # unsafe meta access, ok
-+}
-+
-+#-> sub CPAN::has_usable
-+# has_inst is sometimes too optimistic, we should replace it with this
-+# has_usable whenever a case is given
-+sub has_usable {
-+ my($self,$mod,$message) = @_;
-+ return 1 if $HAS_USABLE->{$mod};
-+ my $has_inst = $self->has_inst($mod,$message);
-+ return unless $has_inst;
-+ my $usable;
-+ $usable = {
-+ LWP => [ # we frequently had "Can't locate object
-+ # method "new" via package "LWP::UserAgent" at
-+ # (eval 69) line 2006
-+ sub {require LWP},
-+ sub {require LWP::UserAgent},
-+ sub {require HTTP::Request},
-+ sub {require URI::URL},
-+ ],
-+ Net::FTP => [
-+ sub {require Net::FTP},
-+ sub {require Net::Config},
-+ ]
-+ };
-+ if ($usable->{$mod}) {
-+ for my $c (0..$#{$usable->{$mod}}) {
-+ my $code = $usable->{$mod}[$c];
-+ my $ret = eval { &$code() };
-+ if ($@) {
-+ warn "DEBUG: c[$c]\$\@[$@]ret[$ret]";
-+ return;
-+ }
-+ }
-+ }
-+ return $HAS_USABLE->{$mod} = 1;
- }
-
- #-> sub CPAN::has_inst
-@@ -677,11 +647,14 @@
- my($self,$mod,$message) = @_;
- Carp::croak("CPAN->has_inst() called without an argument")
- unless defined $mod;
-- if (defined $message && $message eq "no") {
-- $Dontload{$mod}||=1;
-- return 0;
-- } elsif (exists $Dontload{$mod}) {
-- return 0;
-+ if (defined $message && $message eq "no"
-+ ||
-+ exists $CPAN::META->{dontload_hash}{$mod} # unsafe meta access, ok
-+ ||
-+ exists $CPAN::Config->{dontload_hash}{$mod}
-+ ) {
-+ $CPAN::META->{dontload_hash}{$mod}||=1; # unsafe meta access, ok
-+ return 0;
- }
- my $file = $mod;
- my $obj;
-@@ -707,13 +680,13 @@
- }
- return 1;
- } elsif ($mod eq "Net::FTP") {
-- warn qq{
-+ $CPAN::Frontend->mywarn(qq{
- Please, install Net::FTP as soon as possible. CPAN.pm installs it for you
- if you just type
- install Bundle::libnet
-
--};
-- sleep 2;
-+}) unless $Have_warned->{"Net::FTP"}++;
-+ sleep 3;
- } elsif ($mod eq "MD5"){
- $CPAN::Frontend->myprint(qq{
- CPAN: MD5 security checks disabled because MD5 not installed.
-@@ -732,7 +705,9 @@
- my($mgr,$class,$id) = @_;
- CPAN::Index->reload;
- $id ||= "";
-- $META->{$class}{$id} ||= $class->new(ID => $id );
-+ # unsafe meta access, ok?
-+ return $META->{readwrite}{$class}{$id} if exists $META->{readwrite}{$class}{$id};
-+ $META->{readwrite}{$class}{$id} ||= $class->new(ID => $id);
- }
-
- #-> sub CPAN::new ;
-@@ -760,9 +735,9 @@
- }
- }
- return if $ineval && !$End;
-- return unless defined $META->{'LOCK'};
-- return unless -f $META->{'LOCK'};
-- unlink $META->{'LOCK'};
-+ return unless defined $META->{LOCK}; # unsafe meta access, ok
-+ return unless -f $META->{LOCK}; # unsafe meta access, ok
-+ unlink $META->{LOCK}; # unsafe meta access, ok
- # require Carp;
- # Carp::cluck("DEBUGGING");
- $CPAN::Frontend->mywarn("Lockfile removed.\n");
-@@ -785,6 +760,7 @@
- shift->{DU};
- }
-
-+#-> sub CPAN::CacheMgr::tidyup ;
- sub tidyup {
- my($self) = @_;
- return unless -d $self->{ID};
-@@ -942,49 +918,85 @@
- package CPAN::Config;
-
- #-> sub CPAN::Config::edit ;
-+# returns true on successful action
- sub edit {
-- my($class,@args) = @_;
-+ my($self,@args) = @_;
- return unless @args;
-- CPAN->debug("class[$class]args[".join(" | ",@args)."]");
-+ CPAN->debug("self[$self]args[".join(" | ",@args)."]");
- my($o,$str,$func,$args,$key_exists);
- $o = shift @args;
- if($can{$o}) {
-- $class->$o(@args);
-+ $self->$o(@args);
- return 1;
- } else {
-- if (ref($CPAN::Config->{$o}) eq ARRAY) {
-+ CPAN->debug("o[$o]") if $CPAN::DEBUG;
-+ if ($o =~ /list$/) {
- $func = shift @args;
- $func ||= "";
-+ CPAN->debug("func[$func]") if $CPAN::DEBUG;
-+ my $changed;
- # Let's avoid eval, it's easier to comprehend without.
- if ($func eq "push") {
- push @{$CPAN::Config->{$o}}, @args;
-+ $changed = 1;
- } elsif ($func eq "pop") {
- pop @{$CPAN::Config->{$o}};
-+ $changed = 1;
- } elsif ($func eq "shift") {
- shift @{$CPAN::Config->{$o}};
-+ $changed = 1;
- } elsif ($func eq "unshift") {
- unshift @{$CPAN::Config->{$o}}, @args;
-+ $changed = 1;
- } elsif ($func eq "splice") {
- splice @{$CPAN::Config->{$o}}, @args;
-+ $changed = 1;
- } elsif (@args) {
- $CPAN::Config->{$o} = [@args];
-+ $changed = 1;
- } else {
-- $CPAN::Frontend->myprint(
-- join "",
-- " $o ",
-- ExtUtils::MakeMaker::neatvalue($CPAN::Config->{$o}),
-- "\n"
-- );
-+ $self->prettyprint($o);
- }
-+ if ($o eq "urllist" && $changed) {
-+ # reset the cached values
-+ undef $CPAN::FTP::Thesite;
-+ undef $CPAN::FTP::Themethod;
-+ }
-+ return $changed;
- } else {
- $CPAN::Config->{$o} = $args[0] if defined $args[0];
-- $CPAN::Frontend->myprint(" $o " .
-- (defined $CPAN::Config->{$o} ?
-- $CPAN::Config->{$o} : "UNDEFINED"));
-+ $self->prettyprint($o);
- }
- }
- }
-
-+sub prettyprint {
-+ my($self,$k) = @_;
-+ my $v = $CPAN::Config->{$k};
-+ if (ref $v) {
-+ my(@report) = ref $v eq "ARRAY" ?
-+ @$v :
-+ map { sprintf(" %-18s => %s\n",
-+ $_,
-+ defined $v->{$_} ? $v->{$_} : "UNDEFINED"
-+ )} keys %$v;
-+ $CPAN::Frontend->myprint(
-+ join(
-+ "",
-+ sprintf(
-+ " %-18s\n",
-+ $k
-+ ),
-+ map {"\t$_\n"} @report
-+ )
-+ );
-+ } elsif (defined $v) {
-+ $CPAN::Frontend->myprint(sprintf " %-18s %s\n", $k, $v);
-+ } else {
-+ $CPAN::Frontend->myprint(sprintf " %-18s %s\n", $k, "UNDEFINED");
-+ }
-+}
-+
- #-> sub CPAN::Config::commit ;
- sub commit {
- my($self,$configpm) = @_;
-@@ -1005,7 +1017,8 @@
- }
- }
-
-- my $msg = <<EOF unless $configpm =~ /MyConfig/;
-+ my $msg;
-+ $msg = <<EOF unless $configpm =~ /MyConfig/;
-
- # This is CPAN.pm's systemwide configuration file. This file provides
- # defaults for users, and the values can be changed in a per-user
-@@ -1016,7 +1029,8 @@
- $msg ||= "\n";
- my($fh) = FileHandle->new;
- rename $configpm, "$configpm~" if -f $configpm;
-- open $fh, ">$configpm" or warn "Couldn't open >$configpm: $!";
-+ open $fh, ">$configpm" or
-+ $CPAN::Frontend->mywarn("Couldn't open >$configpm: $!");
- $fh->print(qq[$msg\$CPAN::Config = \{\n]);
- foreach (sort keys %$CPAN::Config) {
- $fh->print(
-@@ -1069,8 +1083,8 @@
- # system wide settings
- shift @INC;
- }
-- return unless @miss = $self->not_loaded;
-- # XXX better check for arrayrefs too
-+ return unless @miss = $self->missing_config_data;
-+
- require CPAN::FirstTime;
- my($configpm,$fh,$redo,$theycalled);
- $redo ||= "";
-@@ -1137,15 +1151,18 @@
- CPAN::FirstTime::init($configpm);
- }
-
--#-> sub CPAN::Config::not_loaded ;
--sub not_loaded {
-+#-> sub CPAN::Config::missing_config_data ;
-+sub missing_config_data {
- my(@miss);
-- for (qw(
-- cpan_home keep_source_where build_dir build_cache scan_cache
-- index_expire gzip tar unzip make pager makepl_arg make_arg
-- make_install_arg urllist inhibit_startup_message
-- ftp_proxy http_proxy no_proxy prerequisites_policy
-- )) {
-+ for (
-+ "cpan_home", "keep_source_where", "build_dir", "build_cache",
-+ "scan_cache", "index_expire", "gzip", "tar", "unzip", "make",
-+ "pager",
-+ "makepl_arg", "make_arg", "make_install_arg", "urllist",
-+ "inhibit_startup_message", "ftp_proxy", "http_proxy", "no_proxy",
-+ "prerequisites_policy",
-+ "cache_metadata",
-+ ) {
- push @miss, $_ unless defined $CPAN::Config->{$_};
- }
- return @miss;
-@@ -1241,11 +1258,19 @@
- *help = \&h;
-
- #-> sub CPAN::Shell::a ;
--sub a { $CPAN::Frontend->myprint(shift->format_result('Author',@_));}
--#-> sub CPAN::Shell::b ;
--sub b {
-+sub a {
-+ my($self,@arg) = @_;
-+ # authors are always UPPERCASE
-+ for (@arg) {
-+ $_ = uc $_;
-+ }
-+ $CPAN::Frontend->myprint($self->format_result('Author',@arg));
-+}
-+
-+#-> sub CPAN::Shell::local_bundles ;
-+
-+sub local_bundles {
- my($self,@which) = @_;
-- CPAN->debug("which[@which]") if $CPAN::DEBUG;
- my($incdir,$bdir,$dh);
- foreach $incdir ($CPAN::Config->{'cpan_home'},@INC) {
- $bdir = MM->catdir($incdir,"Bundle");
-@@ -1253,15 +1278,24 @@
- my($entry);
- for $entry ($dh->read) {
- next if -d MM->catdir($bdir,$entry);
-- next unless $entry =~ s/\.pm\z//;
-+ next unless $entry =~ s/\.pm(?!\n)\Z//;
- $CPAN::META->instance('CPAN::Bundle',"Bundle::$entry");
- }
- }
- }
-+}
-+
-+#-> sub CPAN::Shell::b ;
-+sub b {
-+ my($self,@which) = @_;
-+ CPAN->debug("which[@which]") if $CPAN::DEBUG;
-+ $self->local_bundles;
- $CPAN::Frontend->myprint($self->format_result('Bundle',@which));
- }
-+
- #-> sub CPAN::Shell::d ;
- sub d { $CPAN::Frontend->myprint(shift->format_result('Distribution',@_));}
-+
- #-> sub CPAN::Shell::m ;
- sub m { # emacs confused here }; sub mimimimimi { # emacs in sync here
- $CPAN::Frontend->myprint(shift->format_result('Module',@_));
-@@ -1286,13 +1320,16 @@
- }
-
- #-> sub CPAN::Shell::o ;
-+
-+# CPAN::Shell::o and CPAN::Config::edit are closely related. 'o conf'
-+# should have been called set and 'o debug' maybe 'set debug'
- sub o {
- my($self,$o_type,@o_what) = @_;
- $o_type ||= "";
- CPAN->debug("o_type[$o_type] o_what[".join(" | ",@o_what)."]\n");
- if ($o_type eq 'conf') {
- shift @o_what if @o_what && $o_what[0] eq 'help';
-- if (!@o_what) {
-+ if (!@o_what) { # print all things, "o conf"
- my($k,$v);
- $CPAN::Frontend->myprint("CPAN::Config options");
- if (exists $INC{'CPAN/Config.pm'}) {
-@@ -1308,25 +1345,12 @@
- }
- $CPAN::Frontend->myprint("\n");
- for $k (sort keys %$CPAN::Config) {
-- $v = $CPAN::Config->{$k};
-- if (ref $v) {
-- $CPAN::Frontend->myprint(
-- join(
-- "",
-- sprintf(
-- " %-18s\n",
-- $k
-- ),
-- map {"\t$_\n"} @{$v}
-- )
-- );
-- } else {
-- $CPAN::Frontend->myprint(sprintf " %-18s %s\n", $k, $v);
-- }
-+ CPAN::Config->prettyprint($k);
- }
- $CPAN::Frontend->myprint("\n");
- } elsif (!CPAN::Config->edit(@o_what)) {
-- $CPAN::Frontend->myprint(qq[Type 'o conf' to view configuration edit options\n\n]);
-+ $CPAN::Frontend->myprint(qq{Type 'o conf' to view configuration }.
-+ qq{edit options\n\n});
- }
- } elsif ($o_type eq 'debug') {
- my(%valid);
-@@ -1369,7 +1393,8 @@
- my($k,$v);
- for $k (sort {$CPAN::DEBUG{$a} <=> $CPAN::DEBUG{$b}} keys %CPAN::DEBUG) {
- $v = $CPAN::DEBUG{$k};
-- $CPAN::Frontend->myprint(sprintf " %-14s(%s)\n", $k, $v) if $v & $CPAN::DEBUG;
-+ $CPAN::Frontend->myprint(sprintf " %-14s(%s)\n", $k, $v)
-+ if $v & $CPAN::DEBUG;
- }
- } else {
- $CPAN::Frontend->myprint("Debugging turned off completely.\n");
-@@ -1383,10 +1408,10 @@
- }
- }
-
--sub dotdot_onreload {
-+sub paintdots_onreload {
- my($ref) = shift;
- sub {
-- if ( $_[0] =~ /Subroutine (\w+) redefined/ ) {
-+ if ( $_[0] =~ /[Ss]ubroutine (\w+) redefined/ ) {
- my($subr) = $1;
- ++$$ref;
- local($|) = 1;
-@@ -1407,8 +1432,8 @@
- CPAN->debug("reloading the whole CPAN.pm") if $CPAN::DEBUG;
- my $fh = FileHandle->new($INC{'CPAN.pm'});
- local($/);
-- $redef = 0;
-- local($SIG{__WARN__}) = dotdot_onreload(\$redef);
-+ my $redef = 0;
-+ local($SIG{__WARN__}) = paintdots_onreload(\$redef);
- eval <$fh>;
- warn $@ if $@;
- $CPAN::Frontend->myprint("\n$redef subroutines redefined\n");
-@@ -1424,12 +1449,12 @@
- sub _binary_extensions {
- my($self) = shift @_;
- my(@result,$module,%seen,%need,$headerdone);
-- my $isaperl = q{perl5[._-]\\d{3}(_[0-4][0-9])?\\.tar[._-]gz\z};
- for $module ($self->expand('Module','/./')) {
- my $file = $module->cpan_file;
- next if $file eq "N/A";
- next if $file =~ /^Contact Author/;
-- next if $file =~ / $isaperl /xo;
-+ my $dist = $CPAN::META->instance('CPAN::Distribution',$file);
-+ next if $dist->isa_perl;
- next unless $module->xs_file;
- local($|) = 1;
- $CPAN::Frontend->myprint(".");
-@@ -1467,15 +1492,21 @@
- my($self) = shift @_;
- my($what) = shift @_;
- CPAN->debug("self[$self] what[$what] args[@_]") if $CPAN::DEBUG;
-- Carp::croak "Usage: \$obj->_u_r_common($what)" unless defined $what;
-- Carp::croak "Usage: \$obj->_u_r_common(a|r|u)" unless $what =~ /^[aru]$/;
-+ Carp::croak "Usage: \$obj->_u_r_common(a|r|u)" unless
-+ $what && $what =~ /^[aru]$/;
- my(@args) = @_;
- @args = '/./' unless @args;
- my(@result,$module,%seen,%need,$headerdone,
- $version_undefs,$version_zeroes);
- $version_undefs = $version_zeroes = 0;
- my $sprintf = "%-25s %9s %9s %s\n";
-- for $module ($self->expand('Module',@args)) {
-+ my @expand = $self->expand('Module',@args);
-+ my $expand = scalar @expand;
-+ if (0) { # Looks like noise to me, was very useful for debugging
-+ # for metadata cache
-+ $CPAN::Frontend->myprint(sprintf "%d matches in the database\n", $expand);
-+ }
-+ for $module (@expand) {
- my $file = $module->cpan_file;
- next unless defined $file; # ??
- my($latest) = $module->cpan_version;
-@@ -1493,7 +1524,7 @@
- } elsif ($have == 0){
- $version_zeroes++;
- }
-- next if $have >= $latest;
-+ next unless CPAN::Version->vgt($latest, $have);
- # to be pedantic we should probably say:
- # && !($have eq "undef" && $latest ne "undef" && $latest gt "");
- # to catch the case where CPAN has a version 0 and we have a version undef
-@@ -1531,9 +1562,11 @@
- "in CPAN file"
- ));
- }
-- $latest = substr($latest,0,8) if length($latest) > 8;
-- $have = substr($have,0,8) if length($have) > 8;
-- $CPAN::Frontend->myprint(sprintf $sprintf, $module->id, $have, $latest, $file);
-+ $CPAN::Frontend->myprint(sprintf $sprintf,
-+ $module->id,
-+ $have,
-+ $latest,
-+ $file);
- $need{$module->id}++;
- }
- unless (%need) {
-@@ -1615,47 +1648,80 @@
- $to\n\n");
- }
-
-+#-> sub CPAN::Shell::expandany ;
-+sub expandany {
-+ my($self,$s) = @_;
-+ CPAN->debug("s[$s]") if $CPAN::DEBUG;
-+ if ($s =~ m|/|) { # looks like a file
-+ return $CPAN::META->instance('CPAN::Distribution',$s);
-+ # Distributions spring into existence, not expand
-+ } elsif ($s =~ m|^Bundle::|) {
-+ $self->local_bundles; # scanning so late for bundles seems
-+ # both attractive and crumpy: always
-+ # current state but easy to forget
-+ # somewhere
-+ return $self->expand('Bundle',$s);
-+ } else {
-+ return $self->expand('Module',$s)
-+ if $CPAN::META->exists('CPAN::Module',$s);
-+ }
-+ return;
-+}
-+
- #-> sub CPAN::Shell::expand ;
- sub expand {
- shift;
- my($type,@args) = @_;
- my($arg,@m);
- for $arg (@args) {
-- my $regex;
-+ my($regex,$command);
- if ($arg =~ m|^/(.*)/$|) {
- $regex = $1;
-- }
-+ } elsif ($arg =~ m/^=/) {
-+ $command = substr($arg,1);
-+ }
- my $class = "CPAN::$type";
- my $obj;
- if (defined $regex) {
-- for $obj (
-- sort
-- {$a->id cmp $b->id}
-- $CPAN::META->all_objects($class)
-- ) {
-- unless ($obj->id){
-- # BUG, we got an empty object somewhere
-- CPAN->debug(sprintf(
-- "Empty id on obj[%s]%%[%s]",
-- $obj,
-- join(":", %$obj)
-- )) if $CPAN::DEBUG;
-- next;
-- }
-- push @m, $obj
-- if $obj->id =~ /$regex/i
-- or
-- (
-- (
-- $] < 5.00303 ### provide sort of
-- ### compatibility with 5.003
-- ||
-- $obj->can('name')
-- )
-- &&
-- $obj->name =~ /$regex/i
-- );
-- }
-+ for $obj (
-+ sort
-+ {$a->id cmp $b->id}
-+ $CPAN::META->all_objects($class)
-+ ) {
-+ unless ($obj->id){
-+ # BUG, we got an empty object somewhere
-+ CPAN->debug(sprintf(
-+ "Empty id on obj[%s]%%[%s]",
-+ $obj,
-+ join(":", %$obj)
-+ )) if $CPAN::DEBUG;
-+ next;
-+ }
-+ push @m, $obj
-+ if $obj->id =~ /$regex/i
-+ or
-+ (
-+ (
-+ $] < 5.00303 ### provide sort of
-+ ### compatibility with 5.003
-+ ||
-+ $obj->can('name')
-+ )
-+ &&
-+ $obj->name =~ /$regex/i
-+ );
-+ }
-+ } elsif ($command) {
-+ die "leading equal sign in command disabled, ".
-+ "please edit CPAN.pm to enable eval() or ".
-+ "do not use = on argument list";
-+ for my $self (
-+ sort
-+ {$a->id cmp $b->id}
-+ $CPAN::META->all_objects($class)
-+ ) {
-+ push @m, $self if eval $command;
-+ }
- } else {
- my($xarg) = $arg;
- if ( $type eq 'Bundle' ) {
-@@ -1770,42 +1836,41 @@
- }
- setup_output();
- CPAN->debug("pragma[$pragma]meth[$meth] some[@some]") if $CPAN::DEBUG;
-- my($s,@s);
-+
-+ # Here is the place to set "test_count" on all involved parties to
-+ # 0. We then can pass this counter on to the involved
-+ # distributions and those can refuse to test if test_count > X. In
-+ # the first stab at it we could use a 1 for "X".
-+
-+ # But when do I reset the distributions to start with 0 again?
-+ # Jost suggested to have a random or cycling interaction ID that
-+ # we pass through. But the ID is something that is just left lying
-+ # around in addition to the counter, so I'd prefer to set the
-+ # counter to 0 now, and repeat at the end of the loop. But what
-+ # about dependencies? They appear later and are not reset, they
-+ # enter the queue but not its copy. How do they get a sensible
-+ # test_count?
-+
-+ # construct the queue
-+ my($s,@s,@qcopy);
- foreach $s (@some) {
-- CPAN::Queue->new($s);
-- }
-- while ($s = CPAN::Queue->first) {
- my $obj;
- if (ref $s) {
-+ CPAN->debug("s is an object[$s]") if $CPAN::DEBUG;
- $obj = $s;
-- } elsif ($s =~ m|/|) { # looks like a file
-- $obj = $CPAN::META->instance('CPAN::Distribution',$s);
-- } elsif ($s =~ m|^Bundle::|) {
-- $obj = $CPAN::META->instance('CPAN::Bundle',$s);
-+ } elsif ($s =~ m|^/|) { # looks like a regexp
-+ $CPAN::Frontend->mywarn("Sorry, $meth with a regular expression is ".
-+ "not supported\n");
-+ sleep 2;
-+ next;
- } else {
-- $obj = $CPAN::META->instance('CPAN::Module',$s)
-- if $CPAN::META->exists('CPAN::Module',$s);
-+ CPAN->debug("calling expandany [$s]") if $CPAN::DEBUG;
-+ $obj = CPAN::Shell->expandany($s);
- }
- if (ref $obj) {
-- CPAN->debug(
-- qq{pragma[$pragma]meth[$meth]obj[$obj]as_string\[}.
-- $obj->as_string.
-- qq{\]}
-- ) if $CPAN::DEBUG;
-- $obj->$pragma()
-- if
-- $pragma
-- &&
-- ($] < 5.00303 || $obj->can($pragma)); ###
-- ### compatibility
-- ### with
-- ### 5.003
-- if ($]>=5.00303 && $obj->can('called_for')) {
-- $obj->called_for($s);
-- }
-- CPAN::Queue->delete($s) if $obj->$meth(); # if it is more
-- # than once in
-- # the queue
-+ $obj->color_cmd_tmps(0,1);
-+ CPAN::Queue->new($s);
-+ push @qcopy, $obj;
- } elsif ($CPAN::META->exists('CPAN::Author',$s)) {
- $obj = $CPAN::META->instance('CPAN::Author',$s);
- $CPAN::Frontend->myprint(
-@@ -1814,6 +1879,7 @@
- $obj->fullname,
- " ;-)\n"
- );
-+ sleep 2;
- } else {
- $CPAN::Frontend
- ->myprint(qq{Warning: Cannot $meth $s, }.
-@@ -1822,13 +1888,55 @@
-
- i /$s/
-
--to find objects with similar identifiers.
-+to find objects with matching identifiers.
- });
-+ sleep 2;
- }
-+ }
-+
-+ # queuerunner (please be warned: when I started to change the
-+ # queue to hold objects instead of names, I made one or two
-+ # mistakes and never found which. I reverted back instead)
-+ while ($s = CPAN::Queue->first) {
-+ my $obj;
-+ if (ref $s) {
-+ $obj = $s; # I do not believe, we would survive if this happened
-+ } else {
-+ $obj = CPAN::Shell->expandany($s);
-+ }
-+ if ($pragma
-+ &&
-+ ($] < 5.00303 || $obj->can($pragma))){
-+ ### compatibility with 5.003
-+ $obj->$pragma($meth); # the pragma "force" in
-+ # "CPAN::Distribution" must know
-+ # what we are intending
-+ }
-+ if ($]>=5.00303 && $obj->can('called_for')) {
-+ $obj->called_for($s);
-+ }
-+ CPAN->debug(
-+ qq{pragma[$pragma]meth[$meth]obj[$obj]as_string\[}.
-+ $obj->as_string.
-+ qq{\]}
-+ ) if $CPAN::DEBUG;
-+
-+ if ($obj->$meth()){
-+ CPAN::Queue->delete($s);
-+ } else {
-+ CPAN->debug("failed");
-+ }
-+
-+ $obj->undelay;
- CPAN::Queue->delete_first($s);
- }
-+ for my $obj (@qcopy) {
-+ $obj->color_cmd_tmps(0,0);
-+ }
- }
-
-+#-> sub CPAN::Shell::dump ;
-+sub dump { shift->rematein('dump',@_); }
- #-> sub CPAN::Shell::force ;
- sub force { shift->rematein('force',@_); }
- #-> sub CPAN::Shell::get ;
-@@ -1860,7 +1968,7 @@
- my $ftp = Net::FTP->new($host);
- return 0 unless defined $ftp;
- $ftp->debug(1) if $CPAN::DEBUG{'FTP'} & $CPAN::DEBUG;
-- $class->debug(qq[Going to ->login("anonymous","$Config::Config{'cf_email'}")\n]);
-+ $class->debug(qq[Going to login("anonymous","$Config::Config{cf_email}")]);
- unless ( $ftp->login("anonymous",$Config::Config{'cf_email'}) ){
- warn "Couldn't login on $host";
- return;
-@@ -1881,61 +1989,33 @@
-
- # If more accuracy is wanted/needed, Chris Leach sent me this patch...
-
-- # leach,> *** /install/perl/live/lib/CPAN.pm- Wed Sep 24 13:08:48 1997
-- # leach,> --- /tmp/cp Wed Sep 24 13:26:40 1997
-- # leach,> ***************
-- # leach,> *** 1562,1567 ****
-- # leach,> --- 1562,1580 ----
-- # leach,> return 1 if substr($url,0,4) eq "file";
-- # leach,> return 1 unless $url =~ m|://([^/]+)|;
-- # leach,> my $host = $1;
-- # leach,> + my $proxy = $CPAN::Config->{'http_proxy'} || $ENV{'http_proxy'};
-- # leach,> + if ($proxy) {
-- # leach,> + $proxy =~ m|://([^/:]+)|;
-- # leach,> + $proxy = $1;
-- # leach,> + my $noproxy = $CPAN::Config->{'no_proxy'} || $ENV{'no_proxy'};
-- # leach,> + if ($noproxy) {
-- # leach,> + if ($host !~ /$noproxy$/) {
-- # leach,> + $host = $proxy;
-- # leach,> + }
-- # leach,> + } else {
-- # leach,> + $host = $proxy;
-- # leach,> + }
-- # leach,> + }
-- # leach,> require Net::Ping;
-- # leach,> return 1 unless $Net::Ping::VERSION >= 2;
-- # leach,> my $p;
--
--
--# this is quite optimistic and returns one on several occasions where
--# inappropriate. But this does no harm. It would do harm if we were
--# too pessimistic (as I was before the http_proxy
--sub is_reachable {
-- my($self,$url) = @_;
-- return 1; # we can't simply roll our own, firewalls may break ping
-- return 0 unless $url;
-- return 1 if substr($url,0,4) eq "file";
-- return 1 unless $url =~ m|^(\w+)://([^/]+)|;
-- my $proxytype = $1 . "_proxy"; # ftp_proxy or http_proxy
-- my $host = $2;
-- return 1 if $CPAN::Config->{$proxytype} || $ENV{$proxytype};
-- require Net::Ping;
-- return 1 unless $Net::Ping::VERSION >= 2;
-- my $p;
-- # 1.3101 had it different: only if the first eval raised an
-- # exception we tried it with TCP. Now we are happy if icmp wins
-- # the order and return, we don't even check for $@. Thanks to
-- # thayer@uis.edu for the suggestion.
-- eval {$p = Net::Ping->new("icmp");};
-- return 1 if $p && ref($p) && $p->ping($host, 10);
-- eval {$p = Net::Ping->new("tcp");};
-- $CPAN::Frontend->mydie($@) if $@;
-- return $p->ping($host, 10);
--}
-+ # > *** /install/perl/live/lib/CPAN.pm- Wed Sep 24 13:08:48 1997
-+ # > --- /tmp/cp Wed Sep 24 13:26:40 1997
-+ # > ***************
-+ # > *** 1562,1567 ****
-+ # > --- 1562,1580 ----
-+ # > return 1 if substr($url,0,4) eq "file";
-+ # > return 1 unless $url =~ m|://([^/]+)|;
-+ # > my $host = $1;
-+ # > + my $proxy = $CPAN::Config->{'http_proxy'} || $ENV{'http_proxy'};
-+ # > + if ($proxy) {
-+ # > + $proxy =~ m|://([^/:]+)|;
-+ # > + $proxy = $1;
-+ # > + my $noproxy = $CPAN::Config->{'no_proxy'} || $ENV{'no_proxy'};
-+ # > + if ($noproxy) {
-+ # > + if ($host !~ /$noproxy$/) {
-+ # > + $host = $proxy;
-+ # > + }
-+ # > + } else {
-+ # > + $host = $proxy;
-+ # > + }
-+ # > + }
-+ # > require Net::Ping;
-+ # > return 1 unless $Net::Ping::VERSION >= 2;
-+ # > my $p;
-+
-
- #-> sub CPAN::FTP::localize ;
--# sorry for the ugly code here, I'll clean it up as soon as Net::FTP
--# is in the core
- sub localize {
- my($self,$file,$aslocal,$force) = @_;
- $force ||= 0;
-@@ -1945,9 +2025,19 @@
- if $CPAN::DEBUG;
-
- if ($^O eq 'MacOS') {
-+ # Comment by AK on 2000-09-03: Uniq short filenames would be
-+ # available in CHECKSUMS file
- my($name, $path) = File::Basename::fileparse($aslocal, '');
- if (length($name) > 31) {
-- $name =~ s/(\.(readme(\.(gz|Z))?|(tar\.)?(gz|Z)|tgz|zip|pm\.(gz|Z)))$//;
-+ $name =~ s/(
-+ \.(
-+ readme(\.(gz|Z))? |
-+ (tar\.)?(gz|Z) |
-+ tgz |
-+ zip |
-+ pm\.(gz|Z)
-+ )
-+ )$//x;
- my $suf = $1;
- my $size = 31 - length($suf);
- while (length($name) > $size) {
-@@ -1973,19 +2063,22 @@
- to insufficient permissions.\n}) unless -w $aslocal_dir;
-
- # Inheritance is not easier to manage than a few if/else branches
-- if ($CPAN::META->has_inst('LWP::UserAgent')) {
-- require LWP::UserAgent;
-+ if ($CPAN::META->has_usable('LWP::UserAgent')) {
- unless ($Ua) {
- $Ua = LWP::UserAgent->new;
- my($var);
- $Ua->proxy('ftp', $var)
-- if $var = $CPAN::Config->{'ftp_proxy'} || $ENV{'ftp_proxy'};
-+ if $var = $CPAN::Config->{ftp_proxy} || $ENV{ftp_proxy};
- $Ua->proxy('http', $var)
-- if $var = $CPAN::Config->{'http_proxy'} || $ENV{'http_proxy'};
-+ if $var = $CPAN::Config->{http_proxy} || $ENV{http_proxy};
- $Ua->no_proxy($var)
-- if $var = $CPAN::Config->{'no_proxy'} || $ENV{'no_proxy'};
-+ if $var = $CPAN::Config->{no_proxy} || $ENV{no_proxy};
- }
- }
-+ $ENV{ftp_proxy} = $CPAN::Config->{ftp_proxy} if $CPAN::Config->{ftp_proxy};
-+ $ENV{http_proxy} = $CPAN::Config->{http_proxy}
-+ if $CPAN::Config->{http_proxy};
-+ $ENV{no_proxy} = $CPAN::Config->{no_proxy} if $CPAN::Config->{no_proxy};
-
- # Try the list of urls for each single object. We keep a record
- # where we did get a file from
-@@ -2008,14 +2101,16 @@
- ($a == $Thesite)
- } 0..$last;
- }
-- my($level,@levels);
-+ my(@levels);
- if ($Themethod) {
- @levels = ($Themethod, grep {$_ ne $Themethod} qw/easy hard hardest/);
- } else {
- @levels = qw/easy hard hardest/;
- }
- @levels = qw/easy/ if $^O eq 'MacOS';
-- for $level (@levels) {
-+ my($levelno);
-+ for $levelno (0..$#levels) {
-+ my $level = $levels[$levelno];
- my $method = "host$level";
- my @host_seq = $level eq "easy" ?
- @reordered : 0..$last; # reordered has CDROM up front
-@@ -2030,17 +2125,20 @@
- return $ret;
- } else {
- unlink $aslocal;
-+ last if $CPAN::Signal; # need to cleanup
- }
- }
-- my(@mess);
-- push @mess,
-- qq{Please check, if the URLs I found in your configuration file \(}.
-- join(", ", @{$CPAN::Config->{urllist}}).
-- qq{\) are valid. The urllist can be edited.},
-- qq{E.g. with ``o conf urllist push ftp://myurl/''};
-- $CPAN::Frontend->myprint(Text::Wrap::wrap("","",@mess). "\n\n");
-- sleep 2;
-- $CPAN::Frontend->myprint("Cannot fetch $file\n\n");
-+ unless ($CPAN::Signal) {
-+ my(@mess);
-+ push @mess,
-+ qq{Please check, if the URLs I found in your configuration file \(}.
-+ join(", ", @{$CPAN::Config->{urllist}}).
-+ qq{\) are valid. The urllist can be edited.},
-+ qq{E.g. with 'o conf urllist push ftp://myurl/'};
-+ $CPAN::Frontend->myprint(Text::Wrap::wrap("","",@mess). "\n\n");
-+ sleep 2;
-+ $CPAN::Frontend->myprint("Cannot fetch $file\n\n");
-+ }
- if ($restore) {
- rename "$aslocal.bak", $aslocal;
- $CPAN::Frontend->myprint("Trying to get away with old file:\n" .
-@@ -2054,19 +2152,13 @@
- my($self,$host_seq,$file,$aslocal) = @_;
- my($i);
- HOSTEASY: for $i (@$host_seq) {
-- my $url = $CPAN::Config->{urllist}[$i] || $CPAN::Defaultsite;
-- unless ($self->is_reachable($url)) {
-- $CPAN::Frontend->myprint("Skipping $url (seems to be not reachable)\n");
-- sleep 2;
-- next;
-- }
-+ my $url = $CPAN::Config->{urllist}[$i] || $CPAN::Defaultsite;
- $url .= "/" unless substr($url,-1) eq "/";
- $url .= $file;
- $self->debug("localizing perlish[$url]") if $CPAN::DEBUG;
- if ($url =~ /^file:/) {
- my $l;
-- if ($CPAN::META->has_inst('LWP')) {
-- require URI::URL;
-+ if ($CPAN::META->has_inst('URI::URL')) {
- my $u = URI::URL->new($url);
- $l = $u->path;
- } else { # works only on Unix, is poorly constructed, but
-@@ -2095,7 +2187,7 @@
- }
- }
- }
-- if ($CPAN::META->has_inst('LWP')) {
-+ if ($CPAN::META->has_usable('LWP')) {
- $CPAN::Frontend->myprint("Fetching with LWP:
- $url
- ");
-@@ -2110,7 +2202,7 @@
- utime $now, $now, $aslocal; # download time is more
- # important than upload time
- return $aslocal;
-- } elsif ($url !~ /\.gz\z/) {
-+ } elsif ($url !~ /\.gz(?!\n)\Z/) {
- my $gzurl = "$url.gz";
- $CPAN::Frontend->myprint("Fetching with LWP:
- $gzurl
-@@ -2121,22 +2213,20 @@
- ) {
- $Thesite = $i;
- return $aslocal;
-- } else {
-- # next HOSTEASY ;
- }
- } else {
-- # Alan Burlison informed me that in firewall envs Net::FTP
-- # can still succeed where LWP fails. So we do not skip
-- # Net::FTP anymore when LWP is available.
-- # next HOSTEASY ;
-+ # Alan Burlison informed me that in firewall environments
-+ # Net::FTP can still succeed where LWP fails. So we do not
-+ # skip Net::FTP anymore when LWP is available.
- }
- } else {
- $self->debug("LWP not installed") if $CPAN::DEBUG;
- }
-+ return if $CPAN::Signal;
- if ($url =~ m|^ftp://(.*?)/(.*)/(.*)|) {
- # that's the nice and easy way thanks to Graham
- my($host,$dir,$getfile) = ($1,$2,$3);
-- if ($CPAN::META->has_inst('Net::FTP')) {
-+ if ($CPAN::META->has_usable('Net::FTP')) {
- $dir =~ s|/+|/|g;
- $CPAN::Frontend->myprint("Fetching with Net::FTP:
- $url
-@@ -2147,7 +2237,7 @@
- $Thesite = $i;
- return $aslocal;
- }
-- if ($aslocal !~ /\.gz\z/) {
-+ if ($aslocal !~ /\.gz(?!\n)\Z/) {
- my $gz = "$aslocal.gz";
- $CPAN::Frontend->myprint("Fetching with Net::FTP
- $url.gz
-@@ -2165,6 +2255,7 @@
- # next HOSTEASY;
- }
- }
-+ return if $CPAN::Signal;
- }
- }
-
-@@ -2182,10 +2273,6 @@
- File::Path::mkpath($aslocal_dir);
- HOSTHARD: for $i (@$host_seq) {
- my $url = $CPAN::Config->{urllist}[$i] || $CPAN::Defaultsite;
-- unless ($self->is_reachable($url)) {
-- $CPAN::Frontend->myprint("Skipping $url (not reachable)\n");
-- next;
-- }
- $url .= "/" unless substr($url,-1) eq "/";
- $url .= $file;
- my($proto,$host,$dir,$getfile);
-@@ -2199,6 +2286,8 @@
- } else {
- next HOSTHARD; # who said, we could ftp anything except ftp?
- }
-+ next HOSTHARD if $proto eq "file"; # file URLs would have had
-+ # success above. Likely a bogus URL
-
- $self->debug("localizing funkyftpwise[$url]") if $CPAN::DEBUG;
- my($f,$funkyftp);
-@@ -2207,83 +2296,78 @@
- $funkyftp = $CPAN::Config->{$f};
- next unless defined $funkyftp;
- next if $funkyftp =~ /^\s*$/;
-- my($want_compressed);
-- my $aslocal_uncompressed;
-- ($aslocal_uncompressed = $aslocal) =~ s/\.gz//;
-- my($source_switch) = "";
-+ my($asl_ungz, $asl_gz);
-+ ($asl_ungz = $aslocal) =~ s/\.gz//;
-+ $asl_gz = "$asl_ungz.gz";
-+ my($src_switch) = "";
- if ($f eq "lynx"){
-- $source_switch = " -source";
-+ $src_switch = " -source";
- } elsif ($f eq "ncftp"){
-- $source_switch = " -c";
-+ $src_switch = " -c";
- }
- my($chdir) = "";
-- my($stdout_redir) = " > $aslocal_uncompressed";
-+ my($stdout_redir) = " > $asl_ungz";
- if ($f eq "ncftpget"){
- $chdir = "cd $aslocal_dir && ";
- $stdout_redir = "";
- }
- $CPAN::Frontend->myprint(
- qq[
--Trying with "$funkyftp$source_switch" to get
-+Trying with "$funkyftp$src_switch" to get
- $url
- ]);
- my($system) =
-- "$chdir$funkyftp$source_switch '$url' $devnull$stdout_redir";
-+ "$chdir$funkyftp$src_switch '$url' $devnull$stdout_redir";
- $self->debug("system[$system]") if $CPAN::DEBUG;
- my($wstatus);
- if (($wstatus = system($system)) == 0
- &&
- ($f eq "lynx" ?
-- -s $aslocal_uncompressed # lynx returns 0 on my
-- # system even if it fails
-+ -s $asl_ungz # lynx returns 0 when it fails somewhere
- : 1
- )
- ) {
- if (-s $aslocal) {
- # Looks good
-- } elsif ($aslocal_uncompressed ne $aslocal) {
-+ } elsif ($asl_ungz ne $aslocal) {
- # test gzip integrity
-- if (
-- CPAN::Tarzip->gtest($aslocal_uncompressed)
-- ) {
-- rename $aslocal_uncompressed, $aslocal;
-+ if (CPAN::Tarzip->gtest($asl_ungz)) {
-+ # e.g. foo.tar is gzipped --> foo.tar.gz
-+ rename $asl_ungz, $aslocal;
- } else {
-- CPAN::Tarzip->gzip($aslocal_uncompressed,
-- "$aslocal_uncompressed.gz");
-+ CPAN::Tarzip->gzip($asl_ungz,$asl_gz);
- }
- }
- $Thesite = $i;
- return $aslocal;
-- } elsif ($url !~ /\.gz\z/) {
-- unlink $aslocal_uncompressed if
-- -f $aslocal_uncompressed && -s _ == 0;
-+ } elsif ($url !~ /\.gz(?!\n)\Z/) {
-+ unlink $asl_ungz if
-+ -f $asl_ungz && -s _ == 0;
- my $gz = "$aslocal.gz";
- my $gzurl = "$url.gz";
- $CPAN::Frontend->myprint(
- qq[
--Trying with "$funkyftp$source_switch" to get
-+Trying with "$funkyftp$src_switch" to get
- $url.gz
- ]);
-- my($system) = "$funkyftp$source_switch '$url.gz' $devnull > ".
-- "$aslocal_uncompressed.gz";
-+ my($system) = "$funkyftp$src_switch '$url.gz' $devnull > $asl_gz";
- $self->debug("system[$system]") if $CPAN::DEBUG;
- my($wstatus);
- if (($wstatus = system($system)) == 0
- &&
-- -s "$aslocal_uncompressed.gz"
-+ -s $asl_gz
- ) {
- # test gzip integrity
-- if (CPAN::Tarzip->gtest("$aslocal_uncompressed.gz")) {
-- CPAN::Tarzip->gunzip("$aslocal_uncompressed.gz",
-- $aslocal);
-+ if (CPAN::Tarzip->gtest($asl_gz)) {
-+ CPAN::Tarzip->gunzip($asl_gz,$aslocal);
- } else {
-- rename $aslocal_uncompressed, $aslocal;
-+ # somebody uncompressed file for us?
-+ rename $asl_ungz, $aslocal;
- }
- $Thesite = $i;
- return $aslocal;
- } else {
-- unlink "$aslocal_uncompressed.gz" if
-- -f "$aslocal_uncompressed.gz";
-+ unlink $asl_gz if -f $asl_gz;
- }
- } else {
- my $estatus = $wstatus >> 8;
-@@ -2295,8 +2379,9 @@
- returned status $estatus (wstat $wstatus)$size
- });
- }
-- }
-- }
-+ return if $CPAN::Signal;
-+ } # lynx,ncftpget,ncftp
-+ } # host
- }
-
- sub hosthardest {
-@@ -2311,10 +2396,6 @@
- last HOSTHARDEST;
- }
- my $url = $CPAN::Config->{urllist}[$i] || $CPAN::Defaultsite;
-- unless ($self->is_reachable($url)) {
-- $CPAN::Frontend->myprint("Skipping $url (not reachable)\n");
-- next;
-- }
- $url .= "/" unless substr($url,-1) eq "/";
- $url .= $file;
- $self->debug("localizing ftpwise[$url]") if $CPAN::DEBUG;
-@@ -2367,6 +2448,7 @@
- } else {
- $CPAN::Frontend->myprint("Hmm... Still failed!\n");
- }
-+ return if $CPAN::Signal;
- } else {
- $CPAN::Frontend->mywarn(qq{Your $netrcfile is not }.
- qq{correctly protected.\n});
-@@ -2396,9 +2478,10 @@
- } else {
- $CPAN::Frontend->myprint("Bad luck... Still failed!\n");
- }
-+ return if $CPAN::Signal;
- $CPAN::Frontend->myprint("Can't access URL $url.\n\n");
- sleep 2;
-- }
-+ } # host
- }
-
- sub talk_ftp {
-@@ -2576,8 +2659,8 @@
- @return = grep(
- /^$word/,
- sort qw(
-- ! a b d h i m o q r u autobundle clean
-- make test install force reload look cvs_import
-+ ! a b d h i m o q r u autobundle clean dump
-+ make test install force readme reload look cvs_import
- )
- );
- } elsif ( $line !~ /^[\!abcdhimorutl]/ ) {
-@@ -2588,7 +2671,9 @@
- @return = cplx('CPAN::Bundle',$word);
- } elsif ($line =~ /^d\s/) {
- @return = cplx('CPAN::Distribution',$word);
-- } elsif ($line =~ /^([mru]|make|clean|test|install|readme|look|cvs_import)\s/ ) {
-+ } elsif ($line =~ m/^(
-+ [mru]|make|clean|dump|test|install|readme|look|cvs_import
-+ )\s/x ) {
- @return = (cplx('CPAN::Module',$word),cplx('CPAN::Bundle',$word));
- } elsif ($line =~ /^i\s/) {
- @return = cpl_any($word);
-@@ -2605,7 +2690,11 @@
- #-> sub CPAN::Complete::cplx ;
- sub cplx {
- my($class, $word) = @_;
-- grep /^\Q$word\E/, map { $_->id } $CPAN::META->all_objects($class);
-+ # I believed for many years that this was sorted, today I
-+ # realized, it wasn't sorted anymore. Now (rev 1.301 / v 1.55) I
-+ # make it sorted again. Maybe sort was dropped when GNU-readline
-+ # support came in? The RCS file is difficult to read on that:-(
-+ sort grep /^\Q$word\E/, map { $_->id } $CPAN::META->all_objects($class);
- }
-
- #-> sub CPAN::Complete::cpl_any ;
-@@ -2668,51 +2757,63 @@
- for ($CPAN::Config->{index_expire}) {
- $_ = 0.001 unless $_ && $_ > 0.001;
- }
-+ $CPAN::META->{PROTOCOL} ||= "1.0";
-+ if ( $CPAN::META->{PROTOCOL} < PROTOCOL ) {
-+ # warn "Setting last_time to 0";
-+ $last_time = 0; # No warning necessary
-+ }
- return if $last_time + $CPAN::Config->{index_expire}*86400 > $time
- and ! $force;
-- ## IFF we are developing, it helps to wipe out the memory between
-- ## reloads, otherwise it is not what a user expects.
--
-- ## undef $CPAN::META; # Neue Gruendlichkeit since v1.52(r1.274)
-- ## $CPAN::META = CPAN->new;
-- my($debug,$t2);
-+ if (0) {
-+ # IFF we are developing, it helps to wipe out the memory
-+ # between reloads, otherwise it is not what a user expects.
-+ undef $CPAN::META; # Neue Gruendlichkeit since v1.52(r1.274)
-+ $CPAN::META = CPAN->new;
-+ }
-+ {
-+ my($debug,$t2);
-+ local $last_time = $time;
-+ local $CPAN::META->{PROTOCOL} = PROTOCOL;
-+
-+ my $needshort = $^O eq "dos";
-+
-+ $cl->rd_authindex($cl
-+ ->reload_x(
-+ "authors/01mailrc.txt.gz",
-+ $needshort ?
-+ File::Spec->catfile('authors', '01mailrc.gz') :
-+ File::Spec->catfile('authors', '01mailrc.txt.gz'),
-+ $force));
-+ $t2 = time;
-+ $debug = "timing reading 01[".($t2 - $time)."]";
-+ $time = $t2;
-+ return if $CPAN::Signal; # this is sometimes lengthy
-+ $cl->rd_modpacks($cl
-+ ->reload_x(
-+ "modules/02packages.details.txt.gz",
-+ $needshort ?
-+ File::Spec->catfile('modules', '02packag.gz') :
-+ File::Spec->catfile('modules', '02packages.details.txt.gz'),
-+ $force));
-+ $t2 = time;
-+ $debug .= "02[".($t2 - $time)."]";
-+ $time = $t2;
-+ return if $CPAN::Signal; # this is sometimes lengthy
-+ $cl->rd_modlist($cl
-+ ->reload_x(
-+ "modules/03modlist.data.gz",
-+ $needshort ?
-+ File::Spec->catfile('modules', '03mlist.gz') :
-+ File::Spec->catfile('modules', '03modlist.data.gz'),
-+ $force));
-+ $cl->write_metadata_cache;
-+ $t2 = time;
-+ $debug .= "03[".($t2 - $time)."]";
-+ $time = $t2;
-+ CPAN->debug($debug) if $CPAN::DEBUG;
-+ }
- $last_time = $time;
--
-- my $needshort = $^O eq "dos";
--
-- $cl->rd_authindex($cl
-- ->reload_x(
-- "authors/01mailrc.txt.gz",
-- $needshort ?
-- File::Spec->catfile('authors', '01mailrc.gz') :
-- File::Spec->catfile('authors', '01mailrc.txt.gz'),
-- $force));
-- $t2 = time;
-- $debug = "timing reading 01[".($t2 - $time)."]";
-- $time = $t2;
-- return if $CPAN::Signal; # this is sometimes lengthy
-- $cl->rd_modpacks($cl
-- ->reload_x(
-- "modules/02packages.details.txt.gz",
-- $needshort ?
-- File::Spec->catfile('modules', '02packag.gz') :
-- File::Spec->catfile('modules', '02packages.details.txt.gz'),
-- $force));
-- $t2 = time;
-- $debug .= "02[".($t2 - $time)."]";
-- $time = $t2;
-- return if $CPAN::Signal; # this is sometimes lengthy
-- $cl->rd_modlist($cl
-- ->reload_x(
-- "modules/03modlist.data.gz",
-- $needshort ?
-- File::Spec->catfile('modules', '03mlist.gz') :
-- File::Spec->catfile('modules', '03modlist.data.gz'),
-- $force));
-- $t2 = time;
-- $debug .= "03[".($t2 - $time)."]";
-- $time = $t2;
-- CPAN->debug($debug) if $CPAN::DEBUG;
-+ $CPAN::META->{PROTOCOL} = PROTOCOL;
- }
-
- #-> sub CPAN::Index::reload_x ;
-@@ -2773,7 +2874,7 @@
-
- #-> sub CPAN::Index::rd_modpacks ;
- sub rd_modpacks {
-- my($cl, $index_target) = @_;
-+ my($self, $index_target) = @_;
- my @lines;
- return unless defined $index_target;
- $CPAN::Frontend->myprint("Going to read $index_target\n");
-@@ -2785,16 +2886,43 @@
- unshift @ls, "\n" x length($1) if /^(\n+)/;
- push @lines, @ls;
- }
-+ # read header
-+ my $line_count;
- while (@lines) {
- my $shift = shift(@lines);
-+ $shift =~ /^Line-Count:\s+(\d+)/;
-+ $line_count = $1 if $1;
- last if $shift =~ /^\s*$/;
- }
-+ if (not defined $line_count) {
-+
-+ warn qq{Warning: Your $index_target does not contain a Line-Count header.
-+Please check the validity of the index file by comparing it to more
-+than one CPAN mirror. I'll continue but problems seem likely to
-+happen.\a
-+};
-+
-+ sleep 5;
-+ } elsif ($line_count != scalar @lines) {
-+
-+ warn sprintf qq{Warning: Your %s
-+contains a Line-Count header of %d but I see %d lines there. Please
-+check the validity of the index file by comparing it to more than one
-+CPAN mirror. I'll continue but problems seem likely to happen.\a\n},
-+$index_target, $line_count, scalar(@lines);
-+
-+ }
-+ # A necessity since we have metadata_cache: delete what isn't
-+ # there anymore
-+ my $secondtime = $CPAN::META->exists("CPAN::Module","CPAN");
-+ CPAN->debug("secondtime[$secondtime]") if $CPAN::DEBUG;
-+ my(%exists);
- foreach (@lines) {
- chomp;
-- my($mod,$version,$dist) = split;
--### $version =~ s/^\+//;
--
-- # if it is a bundle, instantiate a bundle object
-+ # before 1.56 we split into 3 and discarded the rest. From
-+ # 1.57 we assign remaining text to $comment thus allowing to
-+ # influence isa_perl
-+ my($mod,$version,$dist,$comment) = split " ", $_, 4;
- my($bundle,$id,$userid);
-
- if ($mod eq 'CPAN' &&
-@@ -2803,18 +2931,18 @@
- CPAN::Queue->exists('CPAN')
- )
- ) {
-- local($^W)= 0;
-- if ($version > $CPAN::VERSION){
-- $CPAN::Frontend->myprint(qq{
-- There\'s a new CPAN.pm version (v$version) available!
-+ local($^W)= 0;
-+ if ($version > $CPAN::VERSION){
-+ $CPAN::Frontend->myprint(qq{
-+ There's a new CPAN.pm version (v$version) available!
- [Current version is v$CPAN::VERSION]
- You might want to try
- install Bundle::CPAN
- reload cpan
- without quitting the current session. It should be a seamless upgrade
- while we are running...
--});
-- sleep 2;
-+}); #});
-+ sleep 2;
- $CPAN::Frontend->myprint(qq{\n});
- }
- last if $CPAN::Signal;
-@@ -2824,29 +2952,29 @@
-
- if ($bundle){
- $id = $CPAN::META->instance('CPAN::Bundle',$mod);
-- # warn "made mod[$mod]a bundle";
- # Let's make it a module too, because bundles have so much
-- # in common with modules
-- $CPAN::META->instance('CPAN::Module',$mod);
-- # warn "made mod[$mod]a module";
-+ # in common with modules.
-
--# This "next" makes us faster but if the job is running long, we ignore
--# rereads which is bad. So we have to be a bit slower again.
--# } elsif ($CPAN::META->exists('CPAN::Module',$mod)) {
--# next;
-+ # Changed in 1.57_63: seems like memory bloat now without
-+ # any value, so commented out
-+
-+ # $CPAN::META->instance('CPAN::Module',$mod);
-+
-+ } else {
-
-- }
-- else {
- # instantiate a module object
- $id = $CPAN::META->instance('CPAN::Module',$mod);
-+
- }
-
-- if ($id->cpan_file ne $dist){
-- $userid = $cl->userid($dist);
-+ if ($id->cpan_file ne $dist){ # update only if file is
-+ # different. CPAN prohibits same
-+ # name with different version
-+ $userid = $self->userid($dist);
- $id->set(
- 'CPAN_USERID' => $userid,
- 'CPAN_VERSION' => $version,
-- 'CPAN_FILE' => $dist
-+ 'CPAN_FILE' => $dist,
- );
- }
-
-@@ -2863,13 +2991,29 @@
- $CPAN::META->instance(
- 'CPAN::Distribution' => $dist
- )->set(
-- 'CPAN_USERID' => $userid
-+ 'CPAN_USERID' => $userid,
-+ 'CPAN_COMMENT' => $comment,
- );
- }
--
-+ if ($secondtime) {
-+ for my $name ($mod,$dist) {
-+ CPAN->debug("exists name[$name]") if $CPAN::DEBUG;
-+ $exists{$name} = undef;
-+ }
-+ }
- return if $CPAN::Signal;
- }
- undef $fh;
-+ if ($secondtime) {
-+ for my $class (qw(CPAN::Module CPAN::Bundle CPAN::Distribution)) {
-+ for my $o ($CPAN::META->all_objects($class)) {
-+ next if exists $exists{$o->{ID}};
-+ $CPAN::META->delete($class,$o->{ID});
-+ CPAN->debug("deleting ID[$o->{ID}] in class[$class]")
-+ if $CPAN::DEBUG;
-+ }
-+ }
-+ }
- }
-
- #-> sub CPAN::Index::rd_modlist ;
-@@ -2904,25 +3048,123 @@
- return if $CPAN::Signal;
- for (keys %$ret) {
- my $obj = $CPAN::META->instance(CPAN::Module,$_);
-+ delete $ret->{$_}{modid}; # not needed here, maybe elsewhere
- $obj->set(%{$ret->{$_}});
- return if $CPAN::Signal;
- }
- }
-
-+#-> sub CPAN::Index::write_metadata_cache ;
-+sub write_metadata_cache {
-+ my($self) = @_;
-+ return unless $CPAN::Config->{'cache_metadata'};
-+ return unless $CPAN::META->has_usable("Storable");
-+ my $cache;
-+ foreach my $k (qw(CPAN::Bundle CPAN::Author CPAN::Module
-+ CPAN::Distribution)) {
-+ $cache->{$k} = $CPAN::META->{readonly}{$k}; # unsafe meta access, ok
-+ }
-+ my $metadata_file = MM->catfile($CPAN::Config->{cpan_home},"Metadata");
-+ $cache->{last_time} = $last_time;
-+ $cache->{PROTOCOL} = PROTOCOL;
-+ $CPAN::Frontend->myprint("Going to write $metadata_file\n");
-+ eval { Storable::nstore($cache, $metadata_file) };
-+ $CPAN::Frontend->mywarn($@) if $@;
-+}
-+
-+#-> sub CPAN::Index::read_metadata_cache ;
-+sub read_metadata_cache {
-+ my($self) = @_;
-+ return unless $CPAN::Config->{'cache_metadata'};
-+ return unless $CPAN::META->has_usable("Storable");
-+ my $metadata_file = MM->catfile($CPAN::Config->{cpan_home},"Metadata");
-+ return unless -r $metadata_file and -f $metadata_file;
-+ $CPAN::Frontend->myprint("Going to read $metadata_file\n");
-+ my $cache;
-+ eval { $cache = Storable::retrieve($metadata_file) };
-+ $CPAN::Frontend->mywarn($@) if $@;
-+ if (!$cache || ref $cache ne 'HASH'){
-+ $last_time = 0;
-+ return;
-+ }
-+ if (exists $cache->{PROTOCOL}) {
-+ if (PROTOCOL > $cache->{PROTOCOL}) {
-+ $CPAN::Frontend->mywarn(sprintf("Ignoring Metadata cache written ".
-+ "with protocol v%s, requiring v%s",
-+ $cache->{PROTOCOL},
-+ PROTOCOL)
-+ );
-+ return;
-+ }
-+ } else {
-+ $CPAN::Frontend->mywarn("Ignoring Metadata cache written ".
-+ "with protocol v1.0");
-+ return;
-+ }
-+ my $clcnt = 0;
-+ my $idcnt = 0;
-+ while(my($class,$v) = each %$cache) {
-+ next unless $class =~ /^CPAN::/;
-+ $CPAN::META->{readonly}{$class} = $v; # unsafe meta access, ok
-+ while (my($id,$ro) = each %$v) {
-+ $CPAN::META->{readwrite}{$class}{$id} ||=
-+ $class->new(ID=>$id, RO=>$ro);
-+ $idcnt++;
-+ }
-+ $clcnt++;
-+ }
-+ unless ($clcnt) { # sanity check
-+ $CPAN::Frontend->myprint("Warning: Found no data in $metadata_file\n");
-+ return;
-+ }
-+ if ($idcnt < 1000) {
-+ $CPAN::Frontend->myprint("Warning: Found only $idcnt objects ".
-+ "in $metadata_file\n");
-+ return;
-+ }
-+ $CPAN::META->{PROTOCOL} ||=
-+ $cache->{PROTOCOL}; # reading does not up or downgrade, but it
-+ # does initialize to some protocol
-+ $last_time = $cache->{last_time};
-+}
-+
- package CPAN::InfoObj;
-
-+# Accessors
-+sub cpan_userid { shift->{RO}{CPAN_USERID} }
-+sub id { shift->{ID} }
-+
- #-> sub CPAN::InfoObj::new ;
--sub new { my $this = bless {}, shift; %$this = @_; $this }
-+sub new {
-+ my $this = bless {}, shift;
-+ %$this = @_;
-+ $this
-+}
-+
-+# The set method may only be used by code that reads index data or
-+# otherwise "objective" data from the outside world. All session
-+# related material may do anything else with instance variables but
-+# must not touch the hash under the RO attribute. The reason is that
-+# the RO hash gets written to Metadata file and is thus persistent.
-
- #-> sub CPAN::InfoObj::set ;
- sub set {
- my($self,%att) = @_;
-- my(%oldatt) = %$self;
-- %$self = (%oldatt, %att);
--}
-+ my $class = ref $self;
-
--#-> sub CPAN::InfoObj::id ;
--sub id { shift->{'ID'} }
-+ # This must be ||=, not ||, because only if we write an empty
-+ # reference, only then the set method will write into the readonly
-+ # area. But for Distributions that spring into existence, maybe
-+ # because of a typo, we do not like it that they are written into
-+ # the readonly area and made permanent (at least for a while) and
-+ # that is why we do not "allow" other places to call ->set.
-+ my $ro = $self->{RO} =
-+ $CPAN::META->{readonly}{$class}{$self->id} ||= {};
-+
-+ while (my($k,$v) = each %att) {
-+ $ro->{$k} = $v;
-+ }
-+}
-
- #-> sub CPAN::InfoObj::as_glimpse ;
- sub as_glimpse {
-@@ -2941,31 +3183,36 @@
- my $class = ref($self);
- $class =~ s/^CPAN:://;
- push @m, $class, " id = $self->{ID}\n";
-- for (sort keys %$self) {
-- next if $_ eq 'ID';
-+ for (sort keys %{$self->{RO}}) {
-+ # next if m/^(ID|RO)$/;
- my $extra = "";
- if ($_ eq "CPAN_USERID") {
- $extra .= " (".$self->author;
- my $email; # old perls!
- if ($email = $CPAN::META->instance(CPAN::Author,
-- $self->{$_}
-- )->email) {
-+ $self->cpan_userid
-+ )->email) {
- $extra .= " <$email>";
- } else {
- $extra .= " <no email>";
- }
- $extra .= ")";
- }
-- if (ref($self->{$_}) eq "ARRAY") { # language interface? XXX
-- push @m, sprintf " %-12s %s%s\n", $_, "@{$self->{$_}}", $extra;
-+ next unless defined $self->{RO}{$_};
-+ push @m, sprintf " %-12s %s%s\n", $_, $self->{RO}{$_}, $extra;
-+ }
-+ for (sort keys %$self) {
-+ next if m/^(ID|RO)$/;
-+ if (ref($self->{$_}) eq "ARRAY") {
-+ push @m, sprintf " %-12s %s\n", $_, "@{$self->{$_}}";
- } elsif (ref($self->{$_}) eq "HASH") {
- push @m, sprintf(
-- " %-12s %s%s\n",
-+ " %-12s %s\n",
- $_,
- join(" ",keys %{$self->{$_}}),
-- $extra);
-+ );
- } else {
-- push @m, sprintf " %-12s %s%s\n", $_, $self->{$_}, $extra;
-+ push @m, sprintf " %-12s %s\n", $_, $self->{$_};
- }
- }
- join "", @m, "\n";
-@@ -2974,13 +3221,14 @@
- #-> sub CPAN::InfoObj::author ;
- sub author {
- my($self) = @_;
-- $CPAN::META->instance(CPAN::Author,$self->{CPAN_USERID})->fullname;
-+ $CPAN::META->instance(CPAN::Author,$self->cpan_userid)->fullname;
- }
-
-+#-> sub CPAN::InfoObj::dump ;
- sub dump {
- my($self) = @_;
- require Data::Dumper;
-- Data::Dumper::Dumper($self);
-+ print Data::Dumper::Dumper($self);
- }
-
- package CPAN::Author;
-@@ -2995,21 +3243,53 @@
- join "", @m;
- }
-
--# Dead code, I would have liked to have,,, but it was never reached,,,
--#sub make {
--# my($self) = @_;
--# return "Don't be silly, you can't make $self->{FULLNAME} ;-)\n";
--#}
--
- #-> sub CPAN::Author::fullname ;
--sub fullname { shift->{'FULLNAME'} }
-+sub fullname { shift->{RO}{FULLNAME} }
- *name = \&fullname;
-
- #-> sub CPAN::Author::email ;
--sub email { shift->{'EMAIL'} }
-+sub email { shift->{RO}{EMAIL} }
-
- package CPAN::Distribution;
-
-+# Accessors
-+sub cpan_comment { shift->{RO}{CPAN_COMMENT} }
-+
-+sub undelay {
-+ my $self = shift;
-+ delete $self->{later};
-+}
-+
-+#-> sub CPAN::Distribution::color_cmd_tmps ;
-+sub color_cmd_tmps {
-+ my($self) = shift;
-+ my($depth) = shift || 0;
-+ my($color) = shift || 0;
-+ # a distribution needs to recurse into its prereq_pms
-+
-+ return if exists $self->{incommandcolor}
-+ && $self->{incommandcolor}==$color;
-+ $CPAN::Frontend->mydie(sprintf("CPAN.pm panic: deep recursion in ".
-+ "color_cmd_tmps depth[%s] self[%s] id[%s]",
-+ $depth,
-+ $self,
-+ $self->id
-+ )) if $depth>=100;
-+ ##### warn "color_cmd_tmps $depth $color " . $self->id; # sleep 1;
-+ my $prereq_pm = $self->prereq_pm;
-+ if (defined $prereq_pm) {
-+ for my $pre (keys %$prereq_pm) {
-+ my $premo = CPAN::Shell->expand("Module",$pre);
-+ $premo->color_cmd_tmps($depth+1,$color);
-+ }
-+ }
-+ if ($color==0) {
-+ delete $self->{sponsored_mods};
-+ delete $self->{badtestcnt};
-+ }
-+ $self->{incommandcolor} = $color;
-+}
-+
- #-> sub CPAN::Distribution::as_string ;
- sub as_string {
- my $self = shift;
-@@ -3022,9 +3302,11 @@
- my $self = shift;
- return if exists $self->{CONTAINSMODS};
- for my $mod ($CPAN::META->all_objects("CPAN::Module")) {
-- my $mod_file = $mod->{CPAN_FILE} or next;
-+ my $mod_file = $mod->cpan_file or next;
- my $dist_id = $self->{ID} or next;
- my $mod_id = $mod->{ID} or next;
-+ # warn "mod_file[$mod_file] dist_id[$dist_id] mod_id[$mod_id]";
-+ # sleep 1;
- $self->{CONTAINSMODS}{$mod_id} = undef if $mod_file eq $dist_id;
- }
- }
-@@ -3032,8 +3314,8 @@
- #-> sub CPAN::Distribution::called_for ;
- sub called_for {
- my($self,$id) = @_;
-- $self->{'CALLED_FOR'} = $id if defined $id;
-- return $self->{'CALLED_FOR'};
-+ $self->{CALLED_FOR} = $id if defined $id;
-+ return $self->{CALLED_FOR};
- }
-
- #-> sub CPAN::Distribution::get ;
-@@ -3042,30 +3324,32 @@
- EXCUSE: {
- my @e;
- exists $self->{'build_dir'} and push @e,
-- "Unwrapped into directory $self->{'build_dir'}";
-+ "Is already unwrapped into directory $self->{'build_dir'}";
- $CPAN::Frontend->myprint(join "", map {" $_\n"} @e) and return if @e;
- }
- my($local_file);
- my($local_wanted) =
-- MM->catfile(
-- $CPAN::Config->{keep_source_where},
-- "authors",
-- "id",
-- split("/",$self->{ID})
-- );
-+ MM->catfile(
-+ $CPAN::Config->{keep_source_where},
-+ "authors",
-+ "id",
-+ split("/",$self->id)
-+ );
-
- $self->debug("Doing localize") if $CPAN::DEBUG;
- $local_file =
- CPAN::FTP->localize("authors/id/$self->{ID}", $local_wanted)
- or $CPAN::Frontend->mydie("Giving up on '$local_wanted'\n");
-+ return if $CPAN::Signal;
- $self->{localfile} = $local_file;
-- my $builddir = $CPAN::META->{cachemgr}->dir;
-+ $CPAN::META->{cachemgr} ||= CPAN::CacheMgr->new(); # unsafe meta access, ok
-+ my $builddir = $CPAN::META->{cachemgr}->dir; # unsafe meta access, ok
- $self->debug("doing chdir $builddir") if $CPAN::DEBUG;
- chdir $builddir or Carp::croak("Couldn't chdir $builddir: $!");
- my $packagedir;
-
- $self->debug("local_file[$local_file]") if $CPAN::DEBUG;
-- if ($CPAN::META->has_inst('MD5')) {
-+ if ($CPAN::META->has_inst("MD5")) {
- $self->debug("MD5 is installed, verifying");
- $self->verifyMD5;
- } else {
-@@ -3074,74 +3358,96 @@
- $self->debug("Removing tmp") if $CPAN::DEBUG;
- File::Path::rmtree("tmp");
- mkdir "tmp", 0755 or Carp::croak "Couldn't mkdir tmp: $!";
-- chdir "tmp";
-+ chdir "tmp" or $CPAN::Frontend->mydie(qq{Could not chdir to "tmp": $!});;
- $self->debug("Changed directory to tmp") if $CPAN::DEBUG;
-+ return if $CPAN::Signal;
- if (! $local_file) {
- Carp::croak "bad download, can't do anything :-(\n";
-- } elsif ($local_file =~ /(\.tar\.(gz|Z)|\.tgz)\z/i){
-+ } elsif ($local_file =~ /(\.tar\.(gz|Z)|\.tgz)(?!\n)\Z/i){
-+ $self->{was_uncompressed}++ unless CPAN::Tarzip->gtest($local_file);
- $self->untar_me($local_file);
-- } elsif ( $local_file =~ /\.zip\z/i ) {
-+ } elsif ( $local_file =~ /\.zip(?!\n)\Z/i ) {
- $self->unzip_me($local_file);
-- } elsif ( $local_file =~ /\.pm\.(gz|Z)\z/) {
-+ } elsif ( $local_file =~ /\.pm\.(gz|Z)(?!\n)\Z/) {
-+ $self->{was_uncompressed}++ unless CPAN::Tarzip->gtest($local_file);
- $self->pm2dir_me($local_file);
- } else {
- $self->{archived} = "NO";
- }
-- chdir File::Spec->updir;
-+ my $cwd = File::Spec->updir;
-+ chdir $cwd or $CPAN::Frontend->mydie(qq{Could not chdir to "": $!});
- if ($self->{archived} ne 'NO') {
-- chdir File::Spec->catdir(File::Spec->curdir, "tmp");
-- # Let's check if the package has its own directory.
-- my $dh = DirHandle->new(File::Spec->curdir)
-- or Carp::croak("Couldn't opendir .: $!");
-- my @readdir = grep $_ !~ /^\.\.?\z/s, $dh->read; ### MAC??
-- $dh->close;
-- my ($distdir,$packagedir);
-- if (@readdir == 1 && -d $readdir[0]) {
-- $distdir = $readdir[0];
-- $packagedir = MM->catdir($builddir,$distdir);
-- -d $packagedir and $CPAN::Frontend->myprint("Removing previously used $packagedir\n");
-- File::Path::rmtree($packagedir);
-- rename($distdir,$packagedir) or Carp::confess("Couldn't rename $distdir to $packagedir: $!");
-- } else {
-- my $pragmatic_dir = $self->{'CPAN_USERID'} . '000';
-- $pragmatic_dir =~ s/\W_//g;
-- $pragmatic_dir++ while -d "../$pragmatic_dir";
-- $packagedir = MM->catdir($builddir,$pragmatic_dir);
-- File::Path::mkpath($packagedir);
-- my($f);
-- for $f (@readdir) { # is already without "." and ".."
-- my $to = MM->catdir($packagedir,$f);
-- rename($f,$to) or Carp::confess("Couldn't rename $f to $to: $!");
-- }
-- }
-- $self->{'build_dir'} = $packagedir;
-- chdir File::Spec->updir;
--
-- $self->debug("Changed directory to .. (self is $self [".$self->as_string."])")
-- if $CPAN::DEBUG;
-- File::Path::rmtree("tmp");
-- if ($CPAN::Config->{keep_source_where} =~ /^no/i ){
-- $CPAN::Frontend->myprint("Going to unlink $local_file\n");
-- unlink $local_file or Carp::carp "Couldn't unlink $local_file";
-- }
-- my($makefilepl) = MM->catfile($packagedir,"Makefile.PL");
-- unless (-f $makefilepl) {
-- my($configure) = MM->catfile($packagedir,"Configure");
-- if (-f $configure) {
-- # do we have anything to do?
-- $self->{'configure'} = $configure;
-- } elsif (-f MM->catfile($packagedir,"Makefile")) {
-- $CPAN::Frontend->myprint(qq{
-+ $cwd = File::Spec->catdir(File::Spec->curdir, "tmp");
-+ chdir $cwd or $CPAN::Frontend->mydie(qq{Could not chdir to "$cwd": $!});
-+ # Let's check if the package has its own directory.
-+ my $dh = DirHandle->new(File::Spec->curdir)
-+ or Carp::croak("Couldn't opendir .: $!");
-+ my @readdir = grep $_ !~ /^\.\.?(?!\n)\Z/s, $dh->read; ### MAC??
-+ $dh->close;
-+ my ($distdir,$packagedir);
-+ if (@readdir == 1 && -d $readdir[0]) {
-+ $distdir = $readdir[0];
-+ $packagedir = MM->catdir($builddir,$distdir);
-+ -d $packagedir and $CPAN::Frontend->myprint("Removing previously used ".
-+ "$packagedir\n");
-+ File::Path::rmtree($packagedir);
-+ rename($distdir,$packagedir) or
-+ Carp::confess("Couldn't rename $distdir to $packagedir: $!");
-+ } else {
-+ my $userid = $self->cpan_userid;
-+ unless ($userid) {
-+ CPAN->debug("no userid? self[$self]");
-+ $userid = "anon";
-+ }
-+ my $pragmatic_dir = $userid . '000';
-+ $pragmatic_dir =~ s/\W_//g;
-+ $pragmatic_dir++ while -d "../$pragmatic_dir";
-+ $packagedir = MM->catdir($builddir,$pragmatic_dir);
-+ File::Path::mkpath($packagedir);
-+ my($f);
-+ for $f (@readdir) { # is already without "." and ".."
-+ my $to = MM->catdir($packagedir,$f);
-+ rename($f,$to) or Carp::confess("Couldn't rename $f to $to: $!");
-+ }
-+ }
-+ $self->{'build_dir'} = $packagedir;
-+ $cwd = File::Spec->updir;
-+ chdir $cwd or $CPAN::Frontend->mydie(qq{Could not chdir to "$cwd": $!});
-+
-+ $self->debug("Changed directory to .. (self[$self]=[".
-+ $self->as_string."])") if $CPAN::DEBUG;
-+ File::Path::rmtree("tmp");
-+ if ($CPAN::Config->{keep_source_where} =~ /^no/i ){
-+ $CPAN::Frontend->myprint("Going to unlink $local_file\n");
-+ unlink $local_file or Carp::carp "Couldn't unlink $local_file";
-+ }
-+ my($makefilepl) = MM->catfile($packagedir,"Makefile.PL");
-+ unless (-f $makefilepl) {
-+ my($configure) = MM->catfile($packagedir,"Configure");
-+ if (-f $configure) {
-+ # do we have anything to do?
-+ $self->{'configure'} = $configure;
-+ } elsif (-f MM->catfile($packagedir,"Makefile")) {
-+ $CPAN::Frontend->myprint(qq{
- Package comes with a Makefile and without a Makefile.PL.
- We\'ll try to build it with that Makefile then.
- });
-- $self->{writemakefile} = "YES";
-- sleep 2;
-- } else {
-- my $fh = FileHandle->new(">$makefilepl")
-- or Carp::croak("Could not open >$makefilepl");
-- my $cf = $self->called_for || "unknown";
-- $fh->print(
-+ $self->{writemakefile} = "YES";
-+ sleep 2;
-+ } else {
-+ my $cf = $self->called_for || "unknown";
-+ if ($cf =~ m|/|) {
-+ $cf =~ s|.*/||;
-+ $cf =~ s|\W.*||;
-+ }
-+ $cf =~ s|[/\\:]||g; # risk of filesystem damage
-+ $cf = "unknown" unless length($cf);
-+ $CPAN::Frontend->myprint(qq{Package comes without Makefile.PL.
-+ Writing one on our own (calling it $cf)\n});
-+ $self->{had_no_makefile_pl}++;
-+ my $fh = FileHandle->new(">$makefilepl")
-+ or Carp::croak("Could not open >$makefilepl");
-+ $fh->print(
- qq{# This Makefile.PL has been autogenerated by the module CPAN.pm
- # because there was no Makefile.PL supplied.
- # Autogenerated on: }.scalar localtime().qq{
-@@ -3150,14 +3456,14 @@
- WriteMakefile(NAME => q[$cf]);
-
- });
-- $CPAN::Frontend->myprint(qq{Package comes without Makefile.PL.
-- Writing one on our own (calling it $cf)\n});
-- }
-- }
-+ $fh->close;
-+ }
-+ }
- }
- return $self;
- }
-
-+# CPAN::Distribution::untar_me ;
- sub untar_me {
- my($self,$local_file) = @_;
- $self->{archived} = "tar";
-@@ -3168,22 +3474,23 @@
- }
- }
-
-+# CPAN::Distribution::unzip_me ;
- sub unzip_me {
- my($self,$local_file) = @_;
- $self->{archived} = "zip";
-- my $system = "$CPAN::Config->{unzip} $local_file";
-- if (system($system) == 0) {
-+ if (CPAN::Tarzip->unzip($local_file)) {
- $self->{unwrapped} = "YES";
- } else {
- $self->{unwrapped} = "NO";
- }
-+ return;
- }
-
- sub pm2dir_me {
- my($self,$local_file) = @_;
- $self->{archived} = "pm";
- my $to = File::Basename::basename($local_file);
-- $to =~ s/\.(gz|Z)\z//;
-+ $to =~ s/\.(gz|Z)(?!\n)\Z//;
- if (CPAN::Tarzip->gunzip($local_file,$to)) {
- $self->{unwrapped} = "YES";
- } else {
-@@ -3195,7 +3502,7 @@
- sub new {
- my($class,%att) = @_;
-
-- $CPAN::META->{cachemgr} ||= CPAN::CacheMgr->new();
-+ # $CPAN::META->{cachemgr} ||= CPAN::CacheMgr->new();
-
- my $this = { %att };
- return bless $this, $class;
-@@ -3227,13 +3534,14 @@
- my $getcwd;
- $getcwd = $CPAN::Config->{'getcwd'} || 'cwd';
- my $pwd = CPAN->$getcwd();
-- chdir($dir);
-+ chdir($dir) or $CPAN::Frontend->mydie(qq{Could not chdir to "$dir": $!});
- $CPAN::Frontend->myprint(qq{Working directory is $dir\n});
- system($CPAN::Config->{'shell'}) == 0
- or $CPAN::Frontend->mydie("Subprocess shell error");
-- chdir($pwd);
-+ chdir($pwd) or $CPAN::Frontend->mydie(qq{Could not chdir to "$pwd": $!});
- }
-
-+# CPAN::Distribution::cvs_import ;
- sub cvs_import {
- my($self) = @_;
- $self->get;
-@@ -3243,10 +3551,10 @@
- my $module = $CPAN::META->instance('CPAN::Module', $package);
- my $version = $module->cpan_version;
-
-- my $userid = $self->{CPAN_USERID};
-+ my $userid = $self->cpan_userid;
-
- my $cvs_dir = (split '/', $dir)[-1];
-- $cvs_dir =~ s/-\d+[^-]+\z//;
-+ $cvs_dir =~ s/-\d+[^-]+(?!\n)\Z//;
- my $cvs_root =
- $CPAN::Config->{cvsroot} || $ENV{CVSROOT};
- my $cvs_site_perl =
-@@ -3262,14 +3570,14 @@
- my $getcwd;
- $getcwd = $CPAN::Config->{'getcwd'} || 'cwd';
- my $pwd = CPAN->$getcwd();
-- chdir($dir);
-+ chdir($dir) or $CPAN::Frontend->mydie(qq{Could not chdir to "$dir": $!});
-
- $CPAN::Frontend->myprint(qq{Working directory is $dir\n});
-
- $CPAN::Frontend->myprint(qq{@cmd\n});
-- system(@cmd) == 0 or
-+ system(@cmd) == 0 or
- $CPAN::Frontend->mydie("cvs import failed");
-- chdir($pwd);
-+ chdir($pwd) or $CPAN::Frontend->mydie(qq{Could not chdir to "$pwd": $!});
- }
-
- #-> sub CPAN::Distribution::readme ;
-@@ -3343,7 +3651,7 @@
- $lc_file = CPAN::FTP->localize("authors/id/@local",
- "$lc_want.gz",1);
- if ($lc_file) {
-- $lc_file =~ s/\.gz\z//;
-+ $lc_file =~ s/\.gz(?!\n)\Z//;
- CPAN::Tarzip->gunzip("$lc_file.gz",$lc_file);
- } else {
- return;
-@@ -3401,33 +3709,42 @@
- $CPAN::Frontend->myprint("Checksum for $file ok\n");
- return $self->{MD5_STATUS} = "OK";
- } else {
-- $CPAN::Frontend->myprint(qq{Checksum mismatch for }.
-+ $CPAN::Frontend->myprint(qq{\nChecksum mismatch for }.
- qq{distribution file. }.
- qq{Please investigate.\n\n}.
- $self->as_string,
- $CPAN::META->instance(
- 'CPAN::Author',
-- $self->{CPAN_USERID}
-+ $self->cpan_userid
- )->as_string);
-- my $wrap = qq{I\'d recommend removing $file. It seems to
--be a bogus file. Maybe you have configured your \`urllist\' with a
--bad URL. Please check this array with \`o conf urllist\', and
-+
-+ my $wrap = qq{I\'d recommend removing $file. Its MD5
-+checksum is incorrect. Maybe you have configured your 'urllist' with
-+a bad URL. Please check this array with 'o conf urllist', and
- retry.};
-- $CPAN::Frontend->myprint(Text::Wrap::wrap("","",$wrap));
-- $CPAN::Frontend->myprint("\n\n");
-- sleep 3;
-- return;
-+
-+ $CPAN::Frontend->mydie(Text::Wrap::wrap("","",$wrap));
-+
-+ # former versions just returned here but this seems a
-+ # serious threat that deserves a die
-+
-+ # $CPAN::Frontend->myprint("\n\n");
-+ # sleep 3;
-+ # return;
- }
- # close $fh if fileno($fh);
- } else {
- $self->{MD5_STATUS} ||= "";
- if ($self->{MD5_STATUS} eq "NIL") {
-- $CPAN::Frontend->myprint(qq{
--No md5 checksum for $basename in local $chk_file.
--Removing $chk_file
-+ $CPAN::Frontend->mywarn(qq{
-+Warning: No md5 checksum for $basename in $chk_file.
-+
-+The cause for this may be that the file is very new and the checksum
-+has not yet been calculated, but it may also be that something is
-+going awry right now.
- });
-- unlink $chk_file or $CPAN::Frontend->myprint("Could not unlink: $!");
-- sleep 1;
-+ my $answer = ExtUtils::MakeMaker::prompt("Proceed?", "yes");
-+ $answer =~ /^\s*y/i or $CPAN::Frontend->mydie("Aborted.");
- }
- $self->{MD5_STATUS} = "NIL";
- return;
-@@ -3449,28 +3766,58 @@
- }
-
- #-> sub CPAN::Distribution::force ;
-+
-+# Both modules and distributions know if "force" is in effect by
-+# autoinspection, not by inspecting a global variable. One of the
-+# reason why this was chosen to work that way was the treatment of
-+# dependencies. They should not autpomatically inherit the force
-+# status. But this has the downside that ^C and die() will return to
-+# the prompt but will not be able to reset the force_update
-+# attributes. We try to correct for it currently in the read_metadata
-+# routine, and immediately before we check for a Signal. I hope this
-+# works out in one of v1.57_53ff
-+
- sub force {
-- my($self) = @_;
-- $self->{'force_update'}++;
-+ my($self, $method) = @_;
- for my $att (qw(
- MD5_STATUS archived build_dir localfile make install unwrapped
- writemakefile
- )) {
- delete $self->{$att};
- }
-+ if ($method && $method eq "install") {
-+ $self->{"force_update"}++; # name should probably have been force_install
-+ }
- }
-
-+#-> sub CPAN::Distribution::unforce ;
-+sub unforce {
-+ my($self) = @_;
-+ delete $self->{'force_update'};
-+}
-+
-+#-> sub CPAN::Distribution::isa_perl ;
- sub isa_perl {
- my($self) = @_;
- my $file = File::Basename::basename($self->id);
-- return unless $file =~ m{ ^ perl
-- (5)
-- ([._-])
-- (\d{3}(_[0-4][0-9])?)
-- \.tar[._-]gz
-- \z
-- }xs;
-- "$1.$3";
-+ if ($file =~ m{ ^ perl
-+ -?
-+ (5)
-+ ([._-])
-+ (
-+ \d{3}(_[0-4][0-9])?
-+ |
-+ \d*[24680]\.\d+
-+ )
-+ \.tar[._-]gz
-+ (?!\n)\Z
-+ }xs){
-+ return "$1.$3";
-+ } elsif ($self->cpan_comment
-+ &&
-+ $self->cpan_comment =~ /isa_perl\(.+?\)/){
-+ return $1;
-+ }
- }
-
- #-> sub CPAN::Distribution::perl ;
-@@ -3505,9 +3852,11 @@
- # Emergency brake if they said install Pippi and get newest perl
- if ($self->isa_perl) {
- if (
-- $self->called_for ne $self->id && ! $self->{'force_update'}
-+ $self->called_for ne $self->id &&
-+ ! $self->{force_update}
- ) {
-- $CPAN::Frontend->mydie(sprintf qq{
-+ # if we die here, we break bundles
-+ $CPAN::Frontend->mywarn(sprintf qq{
- The most recent version "%s" of the module "%s"
- comes with the current version of perl (%s).
- I\'ll build that only if you ask for something like
-@@ -3523,6 +3872,7 @@
- $self->isa_perl,
- $self->called_for,
- $self->id);
-+ sleep 5; return;
- }
- }
- $self->get;
-@@ -3539,7 +3889,10 @@
- $1 || "Had some problem writing Makefile";
-
- defined $self->{'make'} and push @e,
-- "Has already been processed within this session";
-+ "Has already been processed within this session";
-+
-+ exists $self->{later} and length($self->{later}) and
-+ push @e, $self->{later};
-
- $CPAN::Frontend->myprint(join "", map {" $_\n"} @e) and return if @e;
- }
-@@ -3606,6 +3959,7 @@
- }
- if (-f "Makefile") {
- $self->{writemakefile} = "YES";
-+ delete $self->{make_clean}; # if cleaned before, enable next
- } else {
- $self->{writemakefile} =
- qq{NO Makefile.PL refused to write a Makefile.};
-@@ -3615,98 +3969,177 @@
- # $self->{writemakefile} .= <$fh>;
- }
- }
-- return if $CPAN::Signal;
-- if (my @prereq = $self->needs_prereq){
-- my $id = $self->id;
-- $CPAN::Frontend->myprint("---- Dependencies detected ".
-- "during [$id] -----\n");
-+ if ($CPAN::Signal){
-+ delete $self->{force_update};
-+ return;
-+ }
-+ if (my @prereq = $self->unsat_prereq){
-+ return 1 if $self->follow_prereqs(@prereq); # signal success to the queuerunner
-+ }
-+ $system = join " ", $CPAN::Config->{'make'}, $CPAN::Config->{make_arg};
-+ if (system($system) == 0) {
-+ $CPAN::Frontend->myprint(" $system -- OK\n");
-+ $self->{'make'} = "YES";
-+ } else {
-+ $self->{writemakefile} ||= "YES";
-+ $self->{'make'} = "NO";
-+ $CPAN::Frontend->myprint(" $system -- NOT OK\n");
-+ }
-+}
-
-- for my $p (@prereq) {
-+sub follow_prereqs {
-+ my($self) = shift;
-+ my(@prereq) = @_;
-+ my $id = $self->id;
-+ $CPAN::Frontend->myprint("---- Unsatisfied dependencies detected ".
-+ "during [$id] -----\n");
-+
-+ for my $p (@prereq) {
- $CPAN::Frontend->myprint(" $p\n");
-- }
-- my $follow = 0;
-- if ($CPAN::Config->{prerequisites_policy} eq "follow") {
-+ }
-+ my $follow = 0;
-+ if ($CPAN::Config->{prerequisites_policy} eq "follow") {
- $follow = 1;
-- } elsif ($CPAN::Config->{prerequisites_policy} eq "ask") {
-+ } elsif ($CPAN::Config->{prerequisites_policy} eq "ask") {
- require ExtUtils::MakeMaker;
- my $answer = ExtUtils::MakeMaker::prompt(
- "Shall I follow them and prepend them to the queue
- of modules we are processing right now?", "yes");
- $follow = $answer =~ /^\s*y/i;
-- } else {
-+ } else {
- local($") = ", ";
-- $CPAN::Frontend->myprint(" Ignoring dependencies on modules @prereq\n");
-- }
-- if ($follow) {
-- CPAN::Queue->jumpqueue(@prereq,$id); # requeue yourself
-- return;
-- }
-+ $CPAN::Frontend->
-+ myprint(" Ignoring dependencies on modules @prereq\n");
- }
-- $system = join " ", $CPAN::Config->{'make'}, $CPAN::Config->{make_arg};
-- if (system($system) == 0) {
-- $CPAN::Frontend->myprint(" $system -- OK\n");
-- $self->{'make'} = "YES";
-- } else {
-- $self->{writemakefile} ||= "YES";
-- $self->{'make'} = "NO";
-- $CPAN::Frontend->myprint(" $system -- NOT OK\n");
-+ if ($follow) {
-+ # color them as dirty
-+ for my $p (@prereq) {
-+ CPAN::Shell->expandany($p)->color_cmd_tmps(0,1);
-+ }
-+ CPAN::Queue->jumpqueue(@prereq,$id); # queue them and requeue yourself
-+ $self->{later} = "Delayed until after prerequisites";
-+ return 1; # signal success to the queuerunner
- }
- }
-
--#-> sub CPAN::Distribution::needs_prereq ;
--sub needs_prereq {
-- my($self) = @_;
-- return unless -f "Makefile"; # we cannot say much
-- my $fh = FileHandle->new("<Makefile") or
-- $CPAN::Frontend->mydie("Couldn't open Makefile: $!");
-- local($/) = "\n";
-+#-> sub CPAN::Distribution::unsat_prereq ;
-+sub unsat_prereq {
-+ my($self) = @_;
-+ my $prereq_pm = $self->prereq_pm or return;
-+ my(@need);
-+ NEED: while (my($need_module, $need_version) = each %$prereq_pm) {
-+ my $nmo = $CPAN::META->instance("CPAN::Module",$need_module);
-+ # we were too demanding:
-+ next if $nmo->uptodate;
-+
-+ # if they have not specified a version, we accept any installed one
-+ if (not defined $need_version or
-+ $need_version == 0 or
-+ $need_version eq "undef") {
-+ next if defined $nmo->inst_file;
-+ }
-
-- my(@p,@need);
-- while (<$fh>) {
-- last if /MakeMaker post_initialize section/;
-- my($p) = m{^[\#]
-+ # We only want to install prereqs if either they're not installed
-+ # or if the installed version is too old. We cannot omit this
-+ # check, because if 'force' is in effect, nobody else will check.
-+ {
-+ local($^W) = 0;
-+ if (
-+ defined $nmo->inst_file &&
-+ ! CPAN::Version->vgt($need_version, $nmo->inst_version)
-+ ){
-+ CPAN->debug(sprintf "id[%s]inst_file[%s]inst_version[%s]need_version[%s]",
-+ $nmo->id,
-+ $nmo->inst_file,
-+ $nmo->inst_version,
-+ CPAN::Version->readable($need_version)
-+ );
-+ next NEED;
-+ }
-+ }
-+
-+ if ($self->{sponsored_mods}{$need_module}++){
-+ # We have already sponsored it and for some reason it's still
-+ # not available. So we do nothing. Or what should we do?
-+ # if we push it again, we have a potential infinite loop
-+ next;
-+ }
-+ push @need, $need_module;
-+ }
-+ @need;
-+}
-+
-+#-> sub CPAN::Distribution::prereq_pm ;
-+sub prereq_pm {
-+ my($self) = @_;
-+ return $self->{prereq_pm} if
-+ exists $self->{prereq_pm_detected} && $self->{prereq_pm_detected};
-+ return unless $self->{writemakefile}; # no need to have succeeded
-+ # but we must have run it
-+ my $build_dir = $self->{build_dir} or die "Panic: no build_dir?";
-+ my $makefile = File::Spec->catfile($build_dir,"Makefile");
-+ my(%p) = ();
-+ my $fh;
-+ if (-f $makefile
-+ and
-+ $fh = FileHandle->new("<$makefile\0")) {
-+
-+ local($/) = "\n";
-+
-+ # A.Speer @p -> %p, where %p is $p{Module::Name}=Required_Version
-+ while (<$fh>) {
-+ last if /MakeMaker post_initialize section/;
-+ my($p) = m{^[\#]
- \s+PREREQ_PM\s+=>\s+(.+)
- }x;
-- next unless $p;
-- # warn "Found prereq expr[$p]";
-+ next unless $p;
-+ # warn "Found prereq expr[$p]";
-
-- while ( $p =~ m/(?:\s)([\w\:]+)=>q\[.*?\],?/g ){
-- push @p, $1;
-- }
-- last;
-- }
-- for my $p (@p) {
-- my $mo = $CPAN::META->instance("CPAN::Module",$p);
-- next if $mo->uptodate;
-- # it's not needed, so don't push it. We cannot omit this step, because
-- # if 'force' is in effect, nobody else will check.
-- if ($self->{have_sponsored}{$p}++){
-- # We have already sponsored it and for some reason it's still
-- # not available. So we do nothing. Or what should we do?
-- # if we push it again, we have a potential infinite loop
-- next;
-- }
-- push @need, $p;
-+ # Regexp modified by A.Speer to remember actual version of file
-+ # PREREQ_PM hash key wants, then add to
-+ while ( $p =~ m/(?:\s)([\w\:]+)=>q\[(.*?)\],?/g ){
-+ # In case a prereq is mentioned twice, complain.
-+ if ( defined $p{$1} ) {
-+ warn "Warning: PREREQ_PM mentions $1 more than once, last mention wins";
-+ }
-+ $p{$1} = $2;
-+ }
-+ last;
-+ }
- }
-- return @need;
-+ $self->{prereq_pm_detected}++;
-+ return $self->{prereq_pm} = \%p;
- }
-
- #-> sub CPAN::Distribution::test ;
- sub test {
- my($self) = @_;
- $self->make;
-- return if $CPAN::Signal;
-+ if ($CPAN::Signal){
-+ delete $self->{force_update};
-+ return;
-+ }
- $CPAN::Frontend->myprint("Running make test\n");
-+ if (my @prereq = $self->unsat_prereq){
-+ return 1 if $self->follow_prereqs(@prereq); # signal success to the queuerunner
-+ }
- EXCUSE: {
- my @e;
-- exists $self->{'make'} or push @e,
-+ exists $self->{make} or exists $self->{later} or push @e,
- "Make had some problems, maybe interrupted? Won't test";
-
- exists $self->{'make'} and
- $self->{'make'} eq 'NO' and
-- push @e, "Oops, make had returned bad status";
-+ push @e, "Can't test without successful make";
-+
-+ exists $self->{build_dir} or push @e, "Has no own directory";
-+ $self->{badtestcnt} ||= 0;
-+ $self->{badtestcnt} > 0 and
-+ push @e, "Won't repeat unsuccessful test during this command";
-+
-+ exists $self->{later} and length($self->{later}) and
-+ push @e, $self->{later};
-
-- exists $self->{'build_dir'} or push @e, "Has no own directory";
- $CPAN::Frontend->myprint(join "", map {" $_\n"} @e) and return if @e;
- }
- chdir $self->{'build_dir'} or
-@@ -3722,9 +4155,10 @@
- my $system = join " ", $CPAN::Config->{'make'}, "test";
- if (system($system) == 0) {
- $CPAN::Frontend->myprint(" $system -- OK\n");
-- $self->{'make_test'} = "YES";
-+ $self->{make_test} = "YES";
- } else {
-- $self->{'make_test'} = "NO";
-+ $self->{make_test} = "NO";
-+ $self->{badtestcnt}++;
- $CPAN::Frontend->myprint(" $system -- NOT OK\n");
- }
- }
-@@ -3735,7 +4169,9 @@
- $CPAN::Frontend->myprint("Running make clean\n");
- EXCUSE: {
- my @e;
-- exists $self->{'build_dir'} or push @e, "Has no own directory";
-+ exists $self->{make_clean} and $self->{make_clean} eq "YES" and
-+ push @e, "make clean already called once";
-+ exists $self->{build_dir} or push @e, "Has no own directory";
- $CPAN::Frontend->myprint(join "", map {" $_\n"} @e) and return if @e;
- }
- chdir $self->{'build_dir'} or
-@@ -3749,10 +4185,31 @@
-
- my $system = join " ", $CPAN::Config->{'make'}, "clean";
- if (system($system) == 0) {
-- $CPAN::Frontend->myprint(" $system -- OK\n");
-- $self->force;
-+ $CPAN::Frontend->myprint(" $system -- OK\n");
-+
-+ # $self->force;
-+
-+ # Jost Krieger pointed out that this "force" was wrong because
-+ # it has the effect that the next "install" on this distribution
-+ # will untar everything again. Instead we should bring the
-+ # object's state back to where it is after untarring.
-+
-+ delete $self->{force_update};
-+ delete $self->{install};
-+ delete $self->{writemakefile};
-+ delete $self->{make};
-+ delete $self->{make_test}; # no matter if yes or no, tests must be redone
-+ $self->{make_clean} = "YES";
-+
- } else {
-- # Hmmm, what to do if make clean failed?
-+ # Hmmm, what to do if make clean failed?
-+
-+ $CPAN::Frontend->myprint(qq{ $system -- NOT OK
-+
-+make clean did not succeed, marking directory as unusable for further work.
-+});
-+ $self->force("make"); # so that this directory won't be used again
-+
- }
- }
-
-@@ -3760,18 +4217,21 @@
- sub install {
- my($self) = @_;
- $self->test;
-- return if $CPAN::Signal;
-+ if ($CPAN::Signal){
-+ delete $self->{force_update};
-+ return;
-+ }
- $CPAN::Frontend->myprint("Running make install\n");
- EXCUSE: {
- my @e;
-- exists $self->{'build_dir'} or push @e, "Has no own directory";
-+ exists $self->{build_dir} or push @e, "Has no own directory";
-
-- exists $self->{'make'} or push @e,
-+ exists $self->{make} or exists $self->{later} or push @e,
- "Make had some problems, maybe interrupted? Won't install";
-
- exists $self->{'make'} and
- $self->{'make'} eq 'NO' and
-- push @e, "Oops, make had returned bad status";
-+ push @e, "make had returned bad status, install seems impossible";
-
- push @e, "make test had returned bad status, ".
- "won't install without force"
-@@ -3783,6 +4243,9 @@
- $self->{'install'} eq "YES" ?
- "Already done" : "Already tried without success";
-
-+ exists $self->{later} and length($self->{later}) and
-+ push @e, $self->{later};
-+
- $CPAN::Frontend->myprint(join "", map {" $_\n"} @e) and return if @e;
- }
- chdir $self->{'build_dir'} or
-@@ -3816,6 +4279,7 @@
- qq{to root to install the package\n});
- }
- }
-+ delete $self->{force_update};
- }
-
- #-> sub CPAN::Distribution::dir ;
-@@ -3825,10 +4289,49 @@
-
- package CPAN::Bundle;
-
-+sub undelay {
-+ my $self = shift;
-+ delete $self->{later};
-+ for my $c ( $self->contains ) {
-+ my $obj = CPAN::Shell->expandany($c) or next;
-+ $obj->undelay;
-+ }
-+}
-+
-+#-> sub CPAN::Bundle::color_cmd_tmps ;
-+sub color_cmd_tmps {
-+ my($self) = shift;
-+ my($depth) = shift || 0;
-+ my($color) = shift || 0;
-+ # a module needs to recurse to its cpan_file, a distribution needs
-+ # to recurse into its prereq_pms, a bundle needs to recurse into its modules
-+
-+ return if exists $self->{incommandcolor}
-+ && $self->{incommandcolor}==$color;
-+ $CPAN::Frontend->mydie(sprintf("CPAN.pm panic: deep recursion in ".
-+ "color_cmd_tmps depth[%s] self[%s] id[%s]",
-+ $depth,
-+ $self,
-+ $self->id
-+ )) if $depth>=100;
-+ ##### warn "color_cmd_tmps $depth $color " . $self->id; # sleep 1;
-+
-+ for my $c ( $self->contains ) {
-+ my $obj = CPAN::Shell->expandany($c) or next;
-+ CPAN->debug("c[$c]obj[$obj]") if $CPAN::DEBUG;
-+ $obj->color_cmd_tmps($depth+1,$color);
-+ }
-+ if ($color==0) {
-+ delete $self->{badtestcnt};
-+ }
-+ $self->{incommandcolor} = $color;
-+}
-+
- #-> sub CPAN::Bundle::as_string ;
- sub as_string {
- my($self) = @_;
- $self->contains;
-+ # following line must be "=", not "||=" because we have a moving target
- $self->{INST_VERSION} = $self->inst_version;
- return $self->SUPER::as_string;
- }
-@@ -3842,9 +4345,9 @@
- unless ($parsefile) {
- # Try to get at it in the cpan directory
- $self->debug("no parsefile") if $CPAN::DEBUG;
-- Carp::confess "I don't know a $id" unless $self->{CPAN_FILE};
-+ Carp::confess "I don't know a $id" unless $self->cpan_file;
- my $dist = $CPAN::META->instance('CPAN::Distribution',
-- $self->{CPAN_FILE});
-+ $self->cpan_file);
- $dist->get;
- $self->debug($dist->as_string) if $CPAN::DEBUG;
- my($todir) = $CPAN::Config->{'cpan_home'};
-@@ -3877,7 +4380,7 @@
- }
- close $fh;
- delete $self->{STATUS};
-- $self->{CONTAINS} = join ", ", @result;
-+ $self->{CONTAINS} = \@result;
- $self->debug("CONTAINS[@result]") if $CPAN::DEBUG;
- unless (@result) {
- $CPAN::Frontend->mywarn(qq{
-@@ -3902,9 +4405,9 @@
- require ExtUtils::Manifest;
- my $getcwd = $CPAN::Config->{'getcwd'} || 'cwd';
- my $cwd = CPAN->$getcwd();
-- chdir $where;
-+ chdir $where or $CPAN::Frontend->mydie(qq{Could not chdir to "$where": $!});
- ExtUtils::Manifest::mkmanifest();
-- chdir $cwd;
-+ chdir $cwd or $CPAN::Frontend->mydie(qq{Could not chdir to "$cwd": $!});
- }
- my $fh = FileHandle->new($manifest)
- or Carp::croak("Couldn't open $manifest: $!");
-@@ -3936,22 +4439,21 @@
- Carp::croak("Couldn't find a Bundle file in $where");
- }
-
-+# needs to work slightly different from Module::inst_file because of
-+# cpan_home/Bundle/ directory.
-+
- #-> sub CPAN::Bundle::inst_file ;
- sub inst_file {
- my($self) = @_;
-- my($me,$inst_file);
-- ($me = $self->id) =~ s/.*://;
--## my(@me,$inst_file);
--## @me = split /::/, $self->id;
--## $me[-1] .= ".pm";
-- $inst_file = MM->catfile($CPAN::Config->{'cpan_home'},
-- "Bundle", "$me.pm");
--## "Bundle", @me);
-- return $self->{'INST_FILE'} = $inst_file if -f $inst_file;
--# $inst_file =
-+ return $self->{INST_FILE} if
-+ exists $self->{INST_FILE} && $self->{INST_FILE};
-+ my($inst_file);
-+ my(@me);
-+ @me = split /::/, $self->id;
-+ $me[-1] .= ".pm";
-+ $inst_file = MM->catfile($CPAN::Config->{'cpan_home'}, @me);
-+ return $self->{INST_FILE} = $inst_file if -f $inst_file;
- $self->SUPER::inst_file;
--# return $self->{'INST_FILE'} = $inst_file if -f $inst_file;
--# return $self->{'INST_FILE'}; # even if undefined?
- }
-
- #-> sub CPAN::Bundle::rematein ;
-@@ -3960,7 +4462,7 @@
- $self->debug("self[$self] meth[$meth]") if $CPAN::DEBUG;
- my($id) = $self->id;
- Carp::croak "Can't $meth $id, don't have an associated bundle file. :-(\n"
-- unless $self->inst_file || $self->{CPAN_FILE};
-+ unless $self->inst_file || $self->cpan_file;
- my($s,%fail);
- for $s ($self->contains) {
- my($type) = $s =~ m|/| ? 'CPAN::Distribution' :
-@@ -3973,14 +4475,36 @@
- sleep 3;
- }
- # possibly noisy action:
-+ $self->debug("type[$type] s[$s]") if $CPAN::DEBUG;
- my $obj = $CPAN::META->instance($type,$s);
- $obj->$meth();
-- my $success = $obj->can("uptodate") ? $obj->uptodate : 0;
-- $success ||= $obj->{'install'} && $obj->{'install'} eq "YES";
-- $fail{$s} = 1 unless $success;
-+ if ($obj->isa(CPAN::Bundle)
-+ &&
-+ exists $obj->{install_failed}
-+ &&
-+ ref($obj->{install_failed}) eq "HASH"
-+ ) {
-+ for (keys %{$obj->{install_failed}}) {
-+ $self->{install_failed}{$_} = undef; # propagate faiure up
-+ # to me in a
-+ # recursive call
-+ $fail{$s} = 1; # the bundle itself may have succeeded but
-+ # not all children
-+ }
-+ } else {
-+ my $success;
-+ $success = $obj->can("uptodate") ? $obj->uptodate : 0;
-+ $success ||= $obj->{'install'} && $obj->{'install'} eq "YES";
-+ if ($success) {
-+ delete $self->{install_failed}{$s};
-+ } else {
-+ $fail{$s} = 1;
-+ }
-+ }
- }
-+
- # recap with less noise
-- if ( $meth eq "install") {
-+ if ( $meth eq "install" ) {
- if (%fail) {
- require Text::Wrap;
- my $raw = sprintf(qq{Bundle summary:
-@@ -3990,9 +4514,21 @@
- $CPAN::Frontend->myprint(Text::Wrap::fill("","",$raw));
- $CPAN::Frontend->myprint("\n");
- my $paragraph = "";
-+ my %reported;
- for $s ($self->contains) {
-- $paragraph .= "$s " if $fail{$s};
-+ if ($fail{$s}){
-+ $paragraph .= "$s ";
-+ $self->{install_failed}{$s} = undef;
-+ $reported{$s} = undef;
-+ }
- }
-+ my $report_propagated;
-+ for $s (sort keys %{$self->{install_failed}}) {
-+ next if exists $reported{$s};
-+ $paragraph .= "and the following items had problems
-+during recursive bundle calls: " unless $report_propagated++;
-+ $paragraph .= "$s ";
-+ }
- $CPAN::Frontend->myprint(Text::Wrap::fill(" "," ",$paragraph));
- $CPAN::Frontend->myprint("\n");
- } else {
-@@ -4015,7 +4551,11 @@
- #-> sub CPAN::Bundle::make ;
- sub make { shift->rematein('make',@_); }
- #-> sub CPAN::Bundle::test ;
--sub test { shift->rematein('test',@_); }
-+sub test {
-+ my $self = shift;
-+ $self->{badtestcnt} ||= 0;
-+ $self->rematein('test',@_);
-+}
- #-> sub CPAN::Bundle::install ;
- sub install {
- my $self = shift;
-@@ -4035,6 +4575,49 @@
-
- package CPAN::Module;
-
-+# Accessors
-+# sub cpan_userid { shift->{RO}{CPAN_USERID} }
-+sub userid {
-+ my $self = shift;
-+ return unless exists $self->{RO}{userid};
-+ $self->{RO}{userid};
-+}
-+sub description { shift->{RO}{description} }
-+
-+sub undelay {
-+ my $self = shift;
-+ delete $self->{later};
-+ if ( my $dist = CPAN::Shell->expand("Distribution", $self->cpan_file) ) {
-+ $dist->undelay;
-+ }
-+}
-+
-+#-> sub CPAN::Module::color_cmd_tmps ;
-+sub color_cmd_tmps {
-+ my($self) = shift;
-+ my($depth) = shift || 0;
-+ my($color) = shift || 0;
-+ # a module needs to recurse to its cpan_file
-+
-+ return if exists $self->{incommandcolor}
-+ && $self->{incommandcolor}==$color;
-+ $CPAN::Frontend->mydie(sprintf("CPAN.pm panic: deep recursion in ".
-+ "color_cmd_tmps depth[%s] self[%s] id[%s]",
-+ $depth,
-+ $self,
-+ $self->id
-+ )) if $depth>=100;
-+ ##### warn "color_cmd_tmps $depth $color " . $self->id; # sleep 1;
-+
-+ if ( my $dist = CPAN::Shell->expand("Distribution", $self->cpan_file) ) {
-+ $dist->color_cmd_tmps($depth+1,$color);
-+ }
-+ if ($color==0) {
-+ delete $self->{badtestcnt};
-+ }
-+ $self->{incommandcolor} = $color;
-+}
-+
- #-> sub CPAN::Module::as_glimpse ;
- sub as_glimpse {
- my($self) = @_;
-@@ -4056,11 +4639,11 @@
- local($^W) = 0;
- push @m, $class, " id = $self->{ID}\n";
- my $sprintf = " %-12s %s\n";
-- push @m, sprintf($sprintf, 'DESCRIPTION', $self->{description})
-- if $self->{description};
-+ push @m, sprintf($sprintf, 'DESCRIPTION', $self->description)
-+ if $self->description;
- my $sprintf2 = " %-12s %s (%s)\n";
- my($userid);
-- if ($userid = $self->{'CPAN_USERID'} || $self->{'userid'}){
-+ if ($userid = $self->cpan_userid || $self->userid){
- my $author;
- if ($author = CPAN::Shell->expand('Author',$userid)) {
- my $email = "";
-@@ -4076,10 +4659,10 @@
- );
- }
- }
-- push @m, sprintf($sprintf, 'CPAN_VERSION', $self->{CPAN_VERSION})
-- if $self->{CPAN_VERSION};
-- push @m, sprintf($sprintf, 'CPAN_FILE', $self->{CPAN_FILE})
-- if $self->{CPAN_FILE};
-+ push @m, sprintf($sprintf, 'CPAN_VERSION', $self->cpan_version)
-+ if $self->cpan_version;
-+ push @m, sprintf($sprintf, 'CPAN_FILE', $self->cpan_file)
-+ if $self->cpan_file;
- my $sprintf3 = " %-12s %1s%1s%1s%1s (%s,%s,%s,%s)\n";
- my(%statd,%stats,%statl,%stati);
- @statd{qw,? i c a b R M S,} = qw,unknown idea
-@@ -4096,24 +4679,28 @@
- push @m, sprintf(
- $sprintf3,
- 'DSLI_STATUS',
-- $self->{statd},
-- $self->{stats},
-- $self->{statl},
-- $self->{stati},
-- $statd{$self->{statd}},
-- $stats{$self->{stats}},
-- $statl{$self->{statl}},
-- $stati{$self->{stati}}
-- ) if $self->{statd};
-+ $self->{RO}{statd},
-+ $self->{RO}{stats},
-+ $self->{RO}{statl},
-+ $self->{RO}{stati},
-+ $statd{$self->{RO}{statd}},
-+ $stats{$self->{RO}{stats}},
-+ $statl{$self->{RO}{statl}},
-+ $stati{$self->{RO}{stati}}
-+ ) if $self->{RO}{statd};
- my $local_file = $self->inst_file;
- if ($local_file) {
- $self->{MANPAGE} ||= $self->manpage_headline($local_file);
- }
- my($item);
-- for $item (qw/MANPAGE CONTAINS/) {
-+ for $item (qw/MANPAGE/) {
- push @m, sprintf($sprintf, $item, $self->{$item})
- if exists $self->{$item};
- }
-+ for $item (qw/CONTAINS/) {
-+ push @m, sprintf($sprintf, $item, join(" ",@{$self->{$item}}))
-+ if exists $self->{$item} && @{$self->{$item}};
-+ }
- push @m, sprintf($sprintf, 'INST_FILE',
- $local_file || "(not installed)");
- push @m, sprintf($sprintf, 'INST_VERSION',
-@@ -4124,7 +4711,7 @@
- sub manpage_headline {
- my($self,$local_file) = @_;
- my(@local_file) = $local_file;
-- $local_file =~ s/\.pm\z/.pod/;
-+ $local_file =~ s/\.pm(?!\n)\Z/.pod/;
- push @local_file, $local_file;
- my(@result,$locf);
- for $locf (@local_file) {
-@@ -4151,19 +4738,23 @@
- #-> sub CPAN::Module::cpan_file ;
- sub cpan_file {
- my $self = shift;
-- CPAN->debug($self->id) if $CPAN::DEBUG;
-- unless (defined $self->{'CPAN_FILE'}) {
-+ CPAN->debug(sprintf "id[%s]", $self->id) if $CPAN::DEBUG;
-+ unless (defined $self->{RO}{CPAN_FILE}) {
- CPAN::Index->reload;
- }
-- if (exists $self->{'CPAN_FILE'} && defined $self->{'CPAN_FILE'}){
-- return $self->{'CPAN_FILE'};
-- } elsif (exists $self->{'userid'} && defined $self->{'userid'}) {
-- my $fullname = $CPAN::META->instance(CPAN::Author,
-- $self->{'userid'})->fullname;
-- my $email = $CPAN::META->instance(CPAN::Author,
-- $self->{'userid'})->email;
-+ if (exists $self->{RO}{CPAN_FILE} && defined $self->{RO}{CPAN_FILE}){
-+ return $self->{RO}{CPAN_FILE};
-+ } elsif ( defined $self->userid ) {
-+ my $fullname = $CPAN::META->instance("CPAN::Author",
-+ $self->userid)->fullname;
-+ my $email = $CPAN::META->instance("CPAN::Author",
-+ $self->userid)->email;
- unless (defined $fullname && defined $email) {
-- return "Contact Author $self->{userid} (Try ``a $self->{userid}'')";
-+ my $userid = $self->userid;
-+ return sprintf("Contact Author %s (Try 'a %s')",
-+ $userid,
-+ $userid,
-+ );
- }
- return "Contact Author $fullname <$email>";
- } else {
-@@ -4176,17 +4767,14 @@
- #-> sub CPAN::Module::cpan_version ;
- sub cpan_version {
- my $self = shift;
-- $self->{'CPAN_VERSION'} = 'undef'
-- unless defined $self->{'CPAN_VERSION'}; # I believe this is
-- # always a bug in the
-- # index and should be
-- # reported as such,
-- # but usually I find
-- # out such an error
-- # and do not want to
-- # provoke too many
-- # bugreports
-- $self->{'CPAN_VERSION'};
-+
-+ $self->{RO}{CPAN_VERSION} = 'undef'
-+ unless defined $self->{RO}{CPAN_VERSION};
-+ # I believe this is always a bug in the index and should be reported
-+ # as such, but usually I find out such an error and do not want to
-+ # provoke too many bugreports
-+
-+ $self->{RO}{CPAN_VERSION};
- }
-
- #-> sub CPAN::Module::force ;
-@@ -4198,7 +4786,9 @@
- #-> sub CPAN::Module::rematein ;
- sub rematein {
- my($self,$meth) = @_;
-- $self->debug($self->id) if $CPAN::DEBUG;
-+ $CPAN::Frontend->myprint(sprintf("Running %s for module %s\n",
-+ $meth,
-+ $self->id));
- my $cpan_file = $self->cpan_file;
- if ($cpan_file eq "N/A" || $cpan_file =~ /^Contact Author/){
- $CPAN::Frontend->mywarn(sprintf qq{
-@@ -4206,7 +4796,7 @@
-
- Either the module has not yet been uploaded to CPAN, or it is
- temporary unavailable. Please contact the author to find out
-- more about the status. Try ``i %s''.
-+ more about the status. Try 'i %s'.
- },
- $self->id,
- $self->id,
-@@ -4215,8 +4805,9 @@
- }
- my $pack = $CPAN::META->instance('CPAN::Distribution',$cpan_file);
- $pack->called_for($self->id);
-- $pack->force if exists $self->{'force_update'};
-+ $pack->force($meth) if exists $self->{'force_update'};
- $pack->$meth();
-+ $pack->unforce if $pack->can("unforce") && exists $self->{'force_update'};
- delete $self->{'force_update'};
- }
-
-@@ -4229,9 +4820,16 @@
- #-> sub CPAN::Module::get ;
- sub get { shift->rematein('get',@_); }
- #-> sub CPAN::Module::make ;
--sub make { shift->rematein('make') }
-+sub make {
-+ my $self = shift;
-+ $self->rematein('make');
-+}
- #-> sub CPAN::Module::test ;
--sub test { shift->rematein('test') }
-+sub test {
-+ my $self = shift;
-+ $self->{badtestcnt} ||= 0;
-+ $self->rematein('test',@_);
-+}
- #-> sub CPAN::Module::uptodate ;
- sub uptodate {
- my($self) = @_;
-@@ -4245,9 +4843,11 @@
- local($^W)=0;
- if ($inst_file
- &&
-- $have >= $latest
-+ ! CPAN::Version->vgt($latest, $have)
- ) {
-- return 1;
-+ CPAN->debug("returning uptodate. inst_file[$inst_file] ".
-+ "latest[$latest] have[$have]") if $CPAN::DEBUG;
-+ return 1;
- }
- return;
- }
-@@ -4304,14 +4904,49 @@
- my($self) = @_;
- my $parsefile = $self->inst_file or return;
- local($^W) = 0 if $] < 5.00303 && $ExtUtils::MakeMaker::VERSION < 5.38;
-- # warn "HERE";
-- my $have = MM->parse_version($parsefile) || "undef";
-+ my $have;
-+
-+ # there was a bug in 5.6.0 that let lots of unini warnings out of
-+ # parse_version. Fixed shortly after 5.6.0 by PMQS. We can remove
-+ # the following workaround after 5.6.1 is out.
-+ local($SIG{__WARN__}) = sub { my $w = shift;
-+ return if $w =~ /uninitialized/i;
-+ warn $w;
-+ };
-+
-+ $have = MM->parse_version($parsefile) || "undef";
-+ $have =~ s/^ //; # since the %vd hack these two lines here are needed
-+ $have =~ s/ $//; # trailing whitespace happens all the time
-+
-+ # My thoughts about why %vd processing should happen here
-+
-+ # Alt1 maintain it as string with leading v:
-+ # read index files do nothing
-+ # compare it use utility for compare
-+ # print it do nothing
-+
-+ # Alt2 maintain it as what is is
-+ # read index files convert
-+ # compare it use utility because there's still a ">" vs "gt" issue
-+ # print it use CPAN::Version for print
-+
-+ # Seems cleaner to hold it in memory as a string starting with a "v"
-+
-+ # If the author of this module made a mistake and wrote a quoted
-+ # "v1.13" instead of v1.13, we simply leave it at that with the
-+ # effect that *we* will treat it like a v-tring while the rest of
-+ # perl won't. Seems sensible when we consider that any action we
-+ # could take now would just add complexity.
-+
-+ $have = CPAN::Version->readable($have);
-+
- $have =~ s/\s*//g; # stringify to float around floating point issues
-- $have;
-+ $have; # no stringify needed, \s* above matches always
- }
-
- package CPAN::Tarzip;
-
-+# CPAN::Tarzip::gzip
- sub gzip {
- my($class,$read,$write) = @_;
- if ($CPAN::META->has_inst("Compress::Zlib")) {
-@@ -4326,10 +4961,12 @@
- $fhw->close;
- return 1;
- } else {
-- system("$CPAN::Config->{'gzip'} -c $read > $write")==0;
-+ system("$CPAN::Config->{gzip} -c $read > $write")==0;
- }
- }
-
-+
-+# CPAN::Tarzip::gunzip
- sub gunzip {
- my($class,$read,$write) = @_;
- if ($CPAN::META->has_inst("Compress::Zlib")) {
-@@ -4346,26 +4983,43 @@
- $fhw->close;
- return 1;
- } else {
-- system("$CPAN::Config->{'gzip'} -dc $read > $write")==0;
-+ system("$CPAN::Config->{gzip} -dc $read > $write")==0;
- }
- }
-
-+
-+# CPAN::Tarzip::gtest
- sub gtest {
- my($class,$read) = @_;
-- if ($CPAN::META->has_inst("Compress::Zlib")) {
-- my($buffer);
-+ # After I had reread the documentation in zlib.h, I discovered that
-+ # uncompressed files do not lead to an gzerror (anymore?).
-+ if ( $CPAN::META->has_inst("Compress::Zlib") ) {
-+ my($buffer,$len);
-+ $len = 0;
- my $gz = Compress::Zlib::gzopen($read, "rb")
-- or $CPAN::Frontend->mydie("Cannot open $read: $!\n");
-- 1 while $gz->gzread($buffer) > 0 ;
-- $CPAN::Frontend->mydie("Error reading from $read: $!\n")
-- if $gz->gzerror != Compress::Zlib::Z_STREAM_END();
-- $gz->gzclose() ;
-- return 1;
-+ or $CPAN::Frontend->mydie(sprintf("Cannot gzopen %s: %s\n",
-+ $read,
-+ $Compress::Zlib::gzerrno));
-+ while ($gz->gzread($buffer) > 0 ){
-+ $len += length($buffer);
-+ $buffer = "";
-+ }
-+ my $err = $gz->gzerror;
-+ my $success = ! $err || $err == Compress::Zlib::Z_STREAM_END();
-+ if ($len == -s $read){
-+ $success = 0;
-+ CPAN->debug("hit an uncompressed file") if $CPAN::DEBUG;
-+ }
-+ $gz->gzclose();
-+ CPAN->debug("err[$err]success[$success]") if $CPAN::DEBUG;
-+ return $success;
- } else {
-- return system("$CPAN::Config->{'gzip'} -dt $read")==0;
-+ return system("$CPAN::Config->{gzip} -dt $read")==0;
- }
- }
-
-+
-+# CPAN::Tarzip::TIEHANDLE
- sub TIEHANDLE {
- my($class,$file) = @_;
- my $ret;
-@@ -4375,7 +5029,7 @@
- die "Could not gzopen $file";
- $ret = bless {GZ => $gz}, $class;
- } else {
-- my $pipe = "$CPAN::Config->{'gzip'} --decompress --stdout $file |";
-+ my $pipe = "$CPAN::Config->{gzip} --decompress --stdout $file |";
- my $fh = FileHandle->new($pipe) or die "Could pipe[$pipe]: $!";
- binmode $fh;
- $ret = bless {FH => $fh}, $class;
-@@ -4383,6 +5037,8 @@
- $ret;
- }
-
-+
-+# CPAN::Tarzip::READLINE
- sub READLINE {
- my($self) = @_;
- if (exists $self->{GZ}) {
-@@ -4397,6 +5053,8 @@
- }
- }
-
-+
-+# CPAN::Tarzip::READ
- sub READ {
- my($self,$ref,$length,$offset) = @_;
- die "read with offset not implemented" if defined $offset;
-@@ -4410,55 +5068,76 @@
- }
- }
-
-+
-+# CPAN::Tarzip::DESTROY
- sub DESTROY {
-- my($self) = @_;
-- if (exists $self->{GZ}) {
-- my $gz = $self->{GZ};
-- $gz->gzclose();
-- } else {
-- my $fh = $self->{FH};
-- $fh->close if defined $fh;
-- }
-- undef $self;
-+ my($self) = @_;
-+ if (exists $self->{GZ}) {
-+ my $gz = $self->{GZ};
-+ $gz->gzclose() if defined $gz; # hard to say if it is allowed
-+ # to be undef ever. AK, 2000-09
-+ } else {
-+ my $fh = $self->{FH};
-+ $fh->close if defined $fh;
-+ }
-+ undef $self;
- }
-
-+
-+# CPAN::Tarzip::untar
- sub untar {
- my($class,$file) = @_;
-- # had to disable, because version 0.07 seems to be buggy
-- if (MM->maybe_command($CPAN::Config->{'gzip'})
-+ if (0) { # makes changing order easier
-+ } elsif (MM->maybe_command($CPAN::Config->{gzip})
- &&
- MM->maybe_command($CPAN::Config->{'tar'})) {
-- my $system = "$CPAN::Config->{'gzip'} --decompress --stdout " .
-- "< $file | $CPAN::Config->{tar} xvf -";
-+ my($system);
-+ my $is_compressed = $class->gtest($file);
-+ if ($is_compressed) {
-+ $system = "$CPAN::Config->{gzip} --decompress --stdout " .
-+ "< $file | $CPAN::Config->{tar} xvf -";
-+ } else {
-+ $system = "$CPAN::Config->{tar} xvf $file";
-+ }
- if (system($system) != 0) {
-- # people find the most curious tar binaries that cannot handle
-- # pipes
-- my $system = "$CPAN::Config->{'gzip'} --decompress $file";
-- if (system($system)==0) {
-- $CPAN::Frontend->myprint(qq{Uncompressed $file successfully\n});
-- } else {
-- $CPAN::Frontend->mydie(
-- qq{Couldn\'t uncompress $file\n}
-- );
-- }
-- $file =~ s/\.gz\z//;
-- $system = "$CPAN::Config->{tar} xvf $file";
-- $CPAN::Frontend->myprint(qq{Using Tar:$system:\n});
-- if (system($system)==0) {
-- $CPAN::Frontend->myprint(qq{Untarred $file successfully\n});
-- } else {
-- $CPAN::Frontend->mydie(qq{Couldn\'t untar $file\n});
-- }
-- return 1;
-+ # people find the most curious tar binaries that cannot handle
-+ # pipes
-+ if ($is_compressed) {
-+ (my $ungzf = $file) =~ s/\.gz(?!\n)\Z//;
-+ if (CPAN::Tarzip->gunzip($file, $ungzf)) {
-+ $CPAN::Frontend->myprint(qq{Uncompressed $file successfully\n});
-+ } else {
-+ $CPAN::Frontend->mydie(qq{Couldn\'t uncompress $file\n});
-+ }
-+ $file = $ungzf;
-+ }
-+ $system = "$CPAN::Config->{tar} xvf $file";
-+ $CPAN::Frontend->myprint(qq{Using Tar:$system:\n});
-+ if (system($system)==0) {
-+ $CPAN::Frontend->myprint(qq{Untarred $file successfully\n});
-+ } else {
-+ $CPAN::Frontend->mydie(qq{Couldn\'t untar $file\n});
-+ }
-+ return 1;
- } else {
-- return 1;
-+ return 1;
- }
- } elsif ($CPAN::META->has_inst("Archive::Tar")
- &&
- $CPAN::META->has_inst("Compress::Zlib") ) {
- my $tar = Archive::Tar->new($file,1);
-- $tar->extract($tar->list_files); # I'm pretty sure we have nothing
-- # that isn't compressed
-+ my $af; # archive file
-+ my @af;
-+ for $af ($tar->list_files) {
-+ if ($af =~ m!^(/|\.\./)!) {
-+ $CPAN::Frontend->mydie("ALERT: Archive contains ".
-+ "illegal member [$af]");
-+ }
-+ $CPAN::Frontend->myprint("$af\n");
-+ push @af, $af;
-+ return if $CPAN::Signal;
-+ }
-+ $tar->extract(@af);
-
- ExtUtils::MM_MacOS::convert_files([$tar->list_files], 1)
- if ($^O eq 'MacOS');
-@@ -4473,6 +5152,119 @@
- }
- }
-
-+sub unzip {
-+ my($class,$file) = @_;
-+ if ($CPAN::META->has_inst("Archive::Zip")) {
-+ # blueprint of the code from Archive::Zip::Tree::extractTree();
-+ my $zip = Archive::Zip->new();
-+ my $status;
-+ $status = $zip->read($file);
-+ die "Read of file[$file] failed\n" if $status != Archive::Zip::AZ_OK();
-+ $CPAN::META->debug("Successfully read file[$file]") if $CPAN::DEBUG;
-+ my @members = $zip->members();
-+ for my $member ( @members ) {
-+ my $af = $member->fileName();
-+ if ($af =~ m!^(/|\.\./)!) {
-+ $CPAN::Frontend->mydie("ALERT: Archive contains ".
-+ "illegal member [$af]");
-+ }
-+ my $status = $member->extractToFileNamed( $af );
-+ $CPAN::META->debug("af[$af]status[$status]") if $CPAN::DEBUG;
-+ die "Extracting of file[$af] from zipfile[$file] failed\n" if
-+ $status != Archive::Zip::AZ_OK();
-+ return if $CPAN::Signal;
-+ }
-+ return 1;
-+ } else {
-+ my $unzip = $CPAN::Config->{unzip} or
-+ $CPAN::Frontend->mydie("Cannot unzip, no unzip program available");
-+ my @system = ($unzip, $file);
-+ return system(@system) == 0;
-+ }
-+}
-+
-+
-+package CPAN::Version;
-+# CPAN::Version::vcmp courtesy Jost Krieger
-+sub vcmp {
-+ my($self,$l,$r) = @_;
-+ local($^W) = 0;
-+ CPAN->debug("l[$l] r[$r]") if $CPAN::DEBUG;
-+
-+ return 0 if $l eq $r; # short circuit for quicker success
-+
-+ if ($l=~/^v/ <=> $r=~/^v/) {
-+ for ($l,$r) {
-+ next if /^v/;
-+ $_ = $self->float2vv($_);
-+ }
-+ }
-+
-+ return
-+ ($l ne "undef") <=> ($r ne "undef") ||
-+ ($] >= 5.006 &&
-+ $l =~ /^v/ &&
-+ $r =~ /^v/ &&
-+ $self->vstring($l) cmp $self->vstring($r)) ||
-+ $l <=> $r ||
-+ $l cmp $r;
-+}
-+
-+sub vgt {
-+ my($self,$l,$r) = @_;
-+ $self->vcmp($l,$r) > 0;
-+}
-+
-+sub vstring {
-+ my($self,$n) = @_;
-+ $n =~ s/^v// or die "CPAN::Version::vstring() called with invalid arg [$n]";
-+ pack "U*", split /\./, $n;
-+}
-+
-+# vv => visible vstring
-+sub float2vv {
-+ my($self,$n) = @_;
-+ my($rev) = int($n);
-+ $rev ||= 0;
-+ my($mantissa) = $n =~ /\.(\d{1,12})/; # limit to 12 digits so that
-+ # architecture cannot
-+ # influnce
-+ $mantissa ||= 0;
-+ $mantissa .= "0" while length($mantissa)%3;
-+ my $ret = "v" . $rev;
-+ while ($mantissa) {
-+ $mantissa =~ s/(\d{1,3})// or
-+ die "Panic: length>0 but not a digit? mantissa[$mantissa]";
-+ $ret .= ".".int($1);
-+ }
-+ # warn "n[$n]ret[$ret]";
-+ $ret;
-+}
-+
-+sub readable {
-+ my($self,$n) = @_;
-+ $n =~ /^([\w\-\+\.]+)/;
-+
-+ return $1 if defined $1 && length($1)>0;
-+ # if the first user reaches version v43, he will be treated as "+".
-+ # We'll have to decide about a new rule here then, depending on what
-+ # will be the prevailing versioning behavior then.
-+
-+ if ($] < 5.006) { # or whenever v-strings were introduced
-+ # we get them wrong anyway, whatever we do, because 5.005 will
-+ # have already interpreted 0.2.4 to be "0.24". So even if he
-+ # indexer sends us something like "v0.2.4" we compare wrongly.
-+
-+ # And if they say v1.2, then the old perl takes it as "v12"
-+
-+ $CPAN::Frontend->mywarn("Suspicious version string seen [$n]");
-+ return $n;
-+ }
-+ my $better = sprintf "v%vd", $n;
-+ CPAN->debug("n[$n] better[$better]") if $CPAN::DEBUG;
-+ return $better;
-+}
-+
- package CPAN;
-
- 1;
-@@ -4584,10 +5376,10 @@
-
- CPAN checks if an install is actually needed for it and prints
- I<module up to date> in the case that the distribution file containing
--the module doesnE<39>t need to be updated.
-+the module doesn't need to be updated.
-
- CPAN also keeps track of what it has done within the current session
--and doesnE<39>t try to build a package a second time regardless if it
-+and doesn't try to build a package a second time regardless if it
- succeeded or not. The C<force> command takes as a first argument the
- method to invoke (currently: C<make>, C<test>, or C<install>) and executes the
- command from scratch.
-@@ -4659,7 +5451,7 @@
- file produced earlier. CPAN installs the whole Bundle for you, but
- when you try to repeat the job on the second architecture, CPAN
- responds with a C<"Foo up to date"> message for all modules. So you
--invoke CPAN's recompile on the second architecture and youE<39>re done.
-+invoke CPAN's recompile on the second architecture and you're done.
-
- Another popular use for C<recompile> is to act as a rescue in case your
- perl breaks binary compatibility. If one of the modules that CPAN uses
-@@ -4704,7 +5496,7 @@
- The first example will be driven by an object of the class
- CPAN::Module, the second by an object of class CPAN::Distribution.
-
--=head2 ProgrammerE<39>s interface
-+=head2 Programmer's interface
-
- If you do not enter the shell, the available shell commands are both
- available as methods (C<CPAN::Shell-E<gt>install(...)>) and as
-@@ -4749,8 +5541,11 @@
- print "No VERSION in ", $mod->id, "\n";
- }
-
-+ # find out which distribution on CPAN contains a module:
-+ print CPAN::Shell->expand("Module","Apache::Constants")->cpan_file
-+
- Or if you want to write a cronjob to watch The CPAN, you could list
--all modules that need updating:
-+all modules that need updating. First a quick and dirty way:
-
- perl -e 'use CPAN; CPAN::Shell->r;'
-
-@@ -4880,17 +5675,18 @@
-
- =head2 Debugging
-
--The debugging of this module is pretty difficult, because we have
-+The debugging of this module is a bit complex, because we have
- interferences of the software producing the indices on CPAN, of the
- mirroring process on CPAN, of packaging, of configuration, of
- synchronicity, and of bugs within CPAN.pm.
-
--In interactive mode you can try "o debug" which will list options for
--debugging the various parts of the package. The output may not be very
--useful for you as it's just a by-product of my own testing, but if you
--have an idea which part of the package may have a bug, it's sometimes
--worth to give it a try and send me more specific output. You should
--know that "o debug" has built-in completion support.
-+For code debugging in interactive mode you can try "o debug" which
-+will list options for debugging the various parts of the code. You
-+should know that "o debug" has built-in completion support.
-+
-+For data debugging there is the C<dump> command which takes the same
-+arguments as make/test/install and outputs the object's Data::Dumper
-+dump.
-
- =head2 Floppy, Zip, Offline Mode
-
-@@ -4918,7 +5714,10 @@
- build_cache size of cache for directories to build modules
- build_dir locally accessible directory to build modules
- index_expire after this many days refetch index files
-+ cache_metadata use serializer to cache metadata
- cpan_home local directory reserved for this package
-+ dontload_hash anonymous hash: modules in the keys will not be
-+ loaded by the CPAN::has_inst() routine
- gzip location of external program gzip
- inactivity_timeout breaks interactive Makefile.PLs after this
- many seconds inactivity. Set to 0 to never break.
-@@ -4973,7 +5772,8 @@
- =head2 Note on urllist parameter's format
-
- urllist parameters are URLs according to RFC 1738. We do a little
--guessing if your URL is not compliant, but if you have problems with file URLs, please try the correct format. Either:
-+guessing if your URL is not compliant, but if you have problems with
-+file URLs, please try the correct format. Either:
-
- file://localhost/whatever/ftp/pub/CPAN/
-
-@@ -5048,7 +5848,13 @@
- =head1 WORKING WITH CPAN.pm BEHIND FIREWALLS
-
- Thanks to Graham Barr for contributing the following paragraphs about
--the interaction between perl, and various firewall configurations.
-+the interaction between perl, and various firewall configurations. For
-+further informations on firewalls, it is recommended to consult the
-+documentation that comes with the ncftp program. If you are unable to
-+go through the firewall with a simple Perl setup, it is very likely
-+that you can configure ncftp so that it works for your firewall.
-+
-+=head2 Three basic types of firewalls
-
- Firewalls can be categorized into three basic types.
-
-@@ -5091,7 +5897,7 @@
- =item SOCKS
-
- If you are using a SOCKS firewall you will need to compile perl and link
--it with the SOCKS library, this is what is normally called a ``socksified''
-+it with the SOCKS library, this is what is normally called a 'socksified'
- perl. With this executable you will be able to connect to servers outside
- the firewall as if it is not there.
-
-@@ -5105,12 +5911,142 @@
-
- =back
-
-+=head2 Configuring lynx or ncftp for going through a firewall
-+
-+If you can go through your firewall with e.g. lynx, presumably with a
-+command such as
-+
-+ /usr/local/bin/lynx -pscott:tiger
-+
-+then you would configure CPAN.pm with the command
-+
-+ o conf lynx "/usr/local/bin/lynx -pscott:tiger"
-+
-+That's all. Similarly for ncftp or ftp, you would configure something
-+like
-+
-+ o conf ncftp "/usr/bin/ncftp -f /home/scott/ncftplogin.cfg"
-+
-+Your milage may vary...
-+
-+=head1 FAQ
-+
-+=over
-+
-+=item 1) I installed a new version of module X but CPAN keeps saying,
-+ I have the old version installed
-+
-+Most probably you B<do> have the old version installed. This can
-+happen if a module installs itself into a different directory in the
-+@INC path than it was previously installed. This is not really a
-+CPAN.pm problem, you would have the same problem when installing the
-+module manually. The easiest way to prevent this behaviour is to add
-+the argument C<UNINST=1> to the C<make install> call, and that is why
-+many people add this argument permanently by configuring
-+
-+ o conf make_install_arg UNINST=1
-+
-+=item 2) So why is UNINST=1 not the default?
-+
-+Because there are people who have their precise expectations about who
-+may install where in the @INC path and who uses which @INC array. In
-+fine tuned environments C<UNINST=1> can cause damage.
-+
-+=item 3) I want to clean up my mess, and install a new perl along with
-+ all modules I have. How do I go about it?
-+
-+Run the autobundle command for your old perl and optionally rename the
-+resulting bundle file (e.g. Bundle/mybundle.pm), install the new perl
-+with the Configure option prefix, e.g.
-+
-+ ./Configure -Dprefix=/usr/local/perl-5.6.78.9
-+
-+Install the bundle file you produced in the first step with something like
-+
-+ cpan> install Bundle::mybundle
-+
-+and you're done.
-+
-+=item 4) When I install bundles or multiple modules with one command
-+ there is too much output to keep track of
-+
-+You may want to configure something like
-+
-+ o conf make_arg "| tee -ai /root/.cpan/logs/make.out"
-+ o conf make_install_arg "| tee -ai /root/.cpan/logs/make_install.out"
-+
-+so that STDOUT is captured in a file for later inspection.
-+
-+
-+=item 5) I am not root, how can I install a module in a personal
-+ directory?
-+
-+You will most probably like something like this:
-+
-+ o conf makepl_arg "LIB=~/myperl/lib \
-+ INSTALLMAN1DIR=~/myperl/man/man1 \
-+ INSTALLMAN3DIR=~/myperl/man/man3"
-+ install Sybase::Sybperl
-+
-+You can make this setting permanent like all C<o conf> settings with
-+C<o conf commit>.
-+
-+You will have to add ~/myperl/man to the MANPATH environment variable
-+and also tell your perl programs to look into ~/myperl/lib, e.g. by
-+including
-+
-+ use lib "$ENV{HOME}/myperl/lib";
-+
-+or setting the PERL5LIB environment variable.
-+
-+Another thing you should bear in mind is that the UNINST parameter
-+should never be set if you are not root.
-+
-+=item 6) How to get a package, unwrap it, and make a change before
-+ building it?
-+
-+ look Sybase::Sybperl
-+
-+=item 7) I installed a Bundle and had a couple of fails. When I
-+ retried, everything resolved nicely. Can this be fixed to work
-+ on first try?
-+
-+The reason for this is that CPAN does not know the dependencies of all
-+modules when it starts out. To decide about the additional items to
-+install, it just uses data found in the generated Makefile. An
-+undetected missing piece breaks the process. But it may well be that
-+your Bundle installs some prerequisite later than some depending item
-+and thus your second try is able to resolve everything. Please note,
-+CPAN.pm does not know the dependency tree in advance and cannot sort
-+the queue of things to install in a topologically correct order. It
-+resolves perfectly well IFF all modules declare the prerequisites
-+correctly with the PREREQ_PM attribute to MakeMaker. For bundles which
-+fail and you need to install often, it is recommended sort the Bundle
-+definition file manually. It is planned to improve the metadata
-+situation for dependencies on CPAN in general, but this will still
-+take some time.
-+
-+=item 8) In our intranet we have many modules for internal use. How
-+ can I integrate these modules with CPAN.pm but without uploading
-+ the modules to CPAN?
-+
-+Have a look at the CPAN::Site module.
-+
-+=item 9) When I run CPAN's shell, I get error msg about line 1 to 4,
-+ setting meta input/output via the /etc/inputrc file.
-+
-+I guess, /etc/inputrc interacts with Term::ReadLine somehow. Maybe
-+just remove /etc/inputrc or set the INPUTRC environment variable (see
-+the readline documentation).
-+
-+=back
-+
- =head1 BUGS
-
- We should give coverage for B<all> of the CPAN and not just the PAUSE
- part, right? In this discussion CPAN and PAUSE have become equal --
--but they are not. PAUSE is authors/ and modules/. CPAN is PAUSE plus
--the clpa/, doc/, misc/, ports/, src/, scripts/.
-+but they are not. PAUSE is authors/, modules/ and scripts/. CPAN is
-+PAUSE plus the clpa/, doc/, misc/, ports/, and src/.
-
- Future development should be directed towards a better integration of
- the other parts.
projects / packages / perl.git / commitdiff