use vars qw( @EXPORT @ISA $VERSION );
@EXPORT = qw( shell fetch get install );
@ISA = qw( Exporter );
- $VERSION = "0.79_01"; #have to hardcode or cpan.org gets unhappy
+ $VERSION = "0.79_02"; #have to hardcode or cpan.org gets unhappy
}
### purely for backward compatibility, so we can call it from the commandline:
"Could not find the '%1' in your path".
"--this may be a problem.\n".
"Please locate this program and set ".
- "your '%1' config entry to its path.\n".
- "Attempting to provide a reasonable ".
- "fallback...",
+ "your '%2' config entry to its path.\n",
$name, 'perlwrapper'
));
- return '-P'
+ return '';
}->(),
},
$dist = $self->status->dist if $self->status->dist;
$self->status->dist( $dist ) unless $self->status->dist;
- my $cb = $self->parent;
- my $conf = $cb->configure_object;
+ my $cb = $self->parent;
+ my $conf = $cb->configure_object;
+ my $format = ref $dist;
### make sure to set this variable, if the caller hasn't yet
### just so we have some clue where the dist left off.
$dist->status->dist( $dist_cpan->status->distdir )
unless defined $dist->status->dist;
- $dist->status->created( $dist_cpan->create( @_ ) );
+ $dist->status->created( $dist_cpan->create(prereq_format => $format, @_) );
}
=head2 $bool = $dist->install
return;
}
- for my $pgm ( qw[make perlwrapper] ) {
+ for my $pgm ( qw[make] ) {
unless( $conf->get_program( $pgm ) ) {
error(loc(
"You do not have '%1' in your path -- '%2' not available\n" .
### start resolving prereqs ###
my $prereqs = $self->status->prereqs;
-
+
### a hashref of prereqs on success, undef on failure ###
$prereqs ||= $dist->_find_prereqs(
verbose => $verbose,
signature => [
sub {
my $cb = shift;
- return if can_run('gpg') and
- $cb->configure_object->get_conf('prefer_bin');
+ return if can_run('gpg');
+ ### leave this out -- Crypt::OpenPGP is fairly
+ ### painful to install, and broken on some platforms
+ ### so we'll just always fall back to gpg. It may
+ ### issue a warning or 2, but that's about it.
+ ### this change due to this ticket: #26914
+ # and $cb->configure_object->get_conf('prefer_bin');
return { 'Crypt::OpenPGP' => '0.0' };
},
- sub {
+ sub {
my $cb = shift;
return $cb->configure_object->get_conf('signature');
},
latest => { default => 0, store => \$latest, allow => BOOLEANS },
force => { default => $conf->get_conf('force'), store => \$force },
};
-
+
check( $tmpl, \%hash ) or return;
my $ref = $cache->{$type};
### do we need the latest versions?
@mods = $latest
? @mods
- : grep { $_->is_installed_version_sufficient } @mods;
+ : grep { !$_->is_installed_version_sufficient } @mods;
my $flag;
for my $mod ( @mods ) {
BEGIN {
use vars qw[ $VERSION @ISA ];
@ISA = qw[ CPANPLUS::Shell::_Base::ReadLine ];
- $VERSION = "0.79_01";
+ $VERSION = "0.79_02";
}
load CPANPLUS::Shell;
unless( $valid{$key} ) {
print loc( "To update your current CPANPLUS installation, ".
"choose one of the these options:\n%1",
- (join $/, map {"\ts selfupdate $_"} sort keys %valid) );
+ ( join $/, map {
+ sprintf "\ts selfupdate %-17s [--latest=0]", $_
+ } sort keys %valid )
+ );
} else {
print loc( "Updating your CPANPLUS installation\n" );
$cb->selfupdate_object->selfupdate(
uupacktool.pl -p lib/CPANPLUS/t/dummy-CPAN/authors/01mailrc.txt.gz lib/CPANPLUS/t/dummy-CPAN/authors/01mailrc.txt.gz.packed
-Created at Sun Apr 22 10:12:09 2007
+Created at Tue May 8 13:53:41 2007
#########################################################################
__UU__
M'XL("%_EO$4``S`Q;6%I;')C+G1X=`!+S,E,+%9P#8T(5@`#)=>*DM"2S)QB
uupacktool.pl -p lib/CPANPLUS/t/dummy-CPAN/authors/id/E/EU/EUNOXS/Bundle-Foo-Bar-0.01.tar.gz lib/CPANPLUS/t/dummy-CPAN/authors/id/E/EU/EUNOXS/Bundle-Foo-Bar-0.01.tar.gz.packed
-Created at Sun Apr 22 10:12:09 2007
+Created at Tue May 8 13:53:41 2007
#########################################################################
__UU__
M'XL("!1%OT4"`T)U;F1L92U&;V\M0F%R+3`N,#$N=&%R`.V7:V_:,!2&^8I_
uupacktool.pl -p lib/CPANPLUS/t/dummy-CPAN/authors/id/E/EU/EUNOXS/Foo-Bar-0.01.tar.gz lib/CPANPLUS/t/dummy-CPAN/authors/id/E/EU/EUNOXS/Foo-Bar-0.01.tar.gz.packed
-Created at Sun Apr 22 10:12:09 2007
+Created at Tue May 8 13:53:41 2007
#########################################################################
__UU__
M'XL("/8X34("`T9O;RU"87(M,"XP,2YT87(`[9KQ;]I&%,?Y^?Z*1YE$(A5C
uupacktool.pl -p lib/CPANPLUS/t/dummy-CPAN/authors/id/E/EU/EUNOXS/perl5.005_03.tar.gz lib/CPANPLUS/t/dummy-CPAN/authors/id/E/EU/EUNOXS/perl5.005_03.tar.gz.packed
-Created at Sun Apr 22 10:12:09 2007
+Created at Tue May 8 13:53:41 2007
#########################################################################
__UU__
M'XL(`'3DO44``^W/,0J`,`Q`T1RE)Y"T-O4XXN"DB%2]OR(*NNC4[;_E#\F0
uupacktool.pl -p lib/CPANPLUS/t/dummy-CPAN/authors/id/E/EU/EUXS/Foo-Bar-0.01.tar.gz lib/CPANPLUS/t/dummy-CPAN/authors/id/E/EU/EUXS/Foo-Bar-0.01.tar.gz.packed
-Created at Sun Apr 22 10:12:09 2007
+Created at Tue May 8 13:53:41 2007
#########################################################################
__UU__
M'XL("`DY34("`T9O;RU"87(M,"XP,2YT87(`[5IK3]M(%,U7YE=<H%5``A.;
uupacktool.pl -p lib/CPANPLUS/t/dummy-CPAN/authors/id/M/MB/MBNOXS/Foo-Bar-0.01.tar.gz lib/CPANPLUS/t/dummy-CPAN/authors/id/M/MB/MBNOXS/Foo-Bar-0.01.tar.gz.packed
-Created at Sun Apr 22 10:12:09 2007
+Created at Tue May 8 13:53:41 2007
#########################################################################
__UU__
M'XL("-<X34(``T9O;RU"87(M,"XP,2YT87(`[9E;;]HP%,=Y]J<X+9722@-R
uupacktool.pl -p lib/CPANPLUS/t/dummy-CPAN/authors/id/M/MB/MBXS/Foo-Bar-0.01.tar.gz lib/CPANPLUS/t/dummy-CPAN/authors/id/M/MB/MBXS/Foo-Bar-0.01.tar.gz.packed
-Created at Sun Apr 22 10:12:09 2007
+Created at Tue May 8 13:53:41 2007
#########################################################################
__UU__
M'XL("-\X34(``T9O;RU"87(M,"XP,2YT87(`[5K_3QI)%/=7YZ]XU39H(BN[
uupacktool.pl -p lib/CPANPLUS/t/dummy-CPAN/modules/02packages.details.txt.gz lib/CPANPLUS/t/dummy-CPAN/modules/02packages.details.txt.gz.packed
-Created at Sun Apr 22 10:12:09 2007
+Created at Tue May 8 13:53:41 2007
#########################################################################
__UU__
M'XL("-%#OT4``S`R<&%C:V%G97,N9&5T86EL<RYT>'0`E=-1:]LP$`#@=_^*
uupacktool.pl -p lib/CPANPLUS/t/dummy-CPAN/modules/03modlist.data.gz lib/CPANPLUS/t/dummy-CPAN/modules/03modlist.data.gz.packed
-Created at Sun Apr 22 10:12:09 2007
+Created at Tue May 8 13:53:41 2007
#########################################################################
__UU__
M'XL("#'FO$4``S`S;6]D;&ES="YD871A`%U3_6O;,!#].?HKCBXC"20A=<@&
# TEST_INSTALL_DIR_BIN,
# TEST_INSTALL_DIR_MAN1,
# TEST_INSTALL_DIR_MAN3,
- ], ( $ENV{PERL_CORE} ? 0 : 1 ) );
+ ], 1 );
return $conf;
};
# TEST_INSTALL_DIR_BIN,
# TEST_INSTALL_DIR_MAN1,
# TEST_INSTALL_DIR_MAN3,
- ], 0 ); # DO NOT be verbose under perl core -- makes tests fail
+ ], 1 );
}
}
for my $dir ( @$dirs ) {
- ### no point if it doesn't exist;
- next unless -d $dir;
-
my $dh;
opendir $dh, $dir or die "Could not open basedir '$dir': $!";
while( my $file = readdir $dh ) {
### directory, rmtree it
if( -d $path ) {
- print "# Deleting directory '$path'\n" if $verbose;
+ print "Deleting directory '$path'\n" if $verbose;
eval { rmtree( $path ) };
warn "Could not delete '$path' while cleaning up '$dir'" if $@;