'CPANPLUS' =>
{
'MAINTAINER' => 'kane',
- 'DISTRIBUTION' => 'BINGOS/CPANPLUS-0.90.tar.gz',
+ 'DISTRIBUTION' => 'BINGOS/CPANPLUS-0.9005.tar.gz',
'FILES' => q[cpan/CPANPLUS],
'EXCLUDED' => [ qr{^inc/},
qr{^t/dummy-.*\.hidden$},
^GD$ # Needs c libaries
^Berk.*DB # DB packages require specific options & linking
- ^DBD:: # DBD drives require database files/headers
+ ^DBD:: # DBD drivers require database files/headers
^XML:: # XML modules usually require expat libraries
Apache # These usually require apache libraries
SSL # These usually require SSL certificates & libs
use vars qw( @EXPORT @ISA $VERSION );
@EXPORT = qw( shell fetch get install );
@ISA = qw( Exporter );
- $VERSION = "0.90"; #have to hardcode or cpan.org gets unhappy
+ $VERSION = "0.9005"; #have to hardcode or cpan.org gets unhappy
}
### purely for backward compatibility, so we can call it from the commandline:
},
{
'scheme' => 'ftp',
- 'path' => '/pub/CPAN/',
- 'host' => 'ftp.nl.uu.net'
+ 'path' => '/',
+ 'host' => 'cpan.hexten.net'
},
{
'scheme' => 'ftp',
- 'path' => '/pub/CPAN/',
- 'host' => 'cpan.valueclick.com'
+ 'path' => '/CPAN/',
+ 'host' => 'cpan.cpantesters.org'
},
{
'scheme' => 'ftp',
### part of core?
if( $modobj->package_is_perl_core ) {
error(loc("Prerequisite '%1' is perl-core (%2) -- not ".
- "installing that. Aborting install",
+ "installing that. -- Note that the overall ".
+ "install may fail due to this.",
$modobj->module, $modobj->package ) );
- $flag++;
- last;
+ next;
}
### circular dependency code ###
keys %$prereqs;
### chdir back to where we started
- chdir $original_wd;
+ $cb->_chdir( dir => $original_wd );
return 1 unless $flag;
return;
}
sub flush {
- return reverse $log->flush;
+ my @foo = $log->flush;
+ return unless @foo;
+ return reverse @foo;
}
sub stack {
CPANPLUS::Internals::Report
];
-$VERSION = "0.90";
+$VERSION = "0.9005";
=pod
my $name = $mod->module;
my $specific;
for my $platform (keys %OS) {
- if( $name =~ /\b$platform\b/i ) {
+ if( $name =~ /^$platform\b/i ) {
# beware the Mac != MAC
next if($platform eq 'Mac' &&
- $name !~ /\b$platform\b/);
+ $name !~ /^$platform\b/);
$specific++;
return 1 if
$^O =~ /^(?:$OS{$platform})$/
my $send_list = {
%$query_list,
- 'Test::Reporter' => '1.34',
+ 'Test::Reporter' => '1.54',
};
sub _have_query_report_modules {
my $name = $mod->module;
my $dist = $mod->package_name . '-' . $mod->package_version;
my $author = $mod->author->author;
+ my $distfile= $mod->author->cpanid . "/" . $mod->package;
my $email = $mod->author->email || CPAN_MAIL_ACCOUNT->( $author );
my $cp_conf = $conf->get_conf('cpantest') || '';
my $int_ver = $CPANPLUS::Internals::VERSION;
Test::Reporter->new(
grade => $grade,
distribution => $dist,
+ distfile => $distfile,
via => "CPANPLUS $int_ver",
timeout => $conf->get_conf('timeout') || 60,
debug => $conf->get_conf('debug'),
{ AutoCommit => 1 }
);
#$Dbh->dbh->trace(1);
+ $Dbh->query(qq{PRAGMA synchronous = OFF});
return $Dbh;
};
sub _standard_trees_completed { return $used_old_copy }
sub _custom_trees_completed { return }
### finish transaction
- sub _finalize_trees { $_[0]->__sqlite_dbh->query('COMMIT'); return 1 }
+ sub _finalize_trees { $_[0]->__sqlite_dbh->commit; return 1 }
### saves current memory state, but not implemented in sqlite
sub _save_state {
### keep counting how many we inserted
unless( ++$txn_count % TXN_COMMIT ) {
#warn "Committing transaction $txn_count";
- $dbh->query('COMMIT') or error( $dbh->error ); # commit previous transaction
- $dbh->query('BEGIN') or error( $dbh->error ); # and start a new one
+ $dbh->commit or error( $dbh->error ); # commit previous transaction
+ $dbh->begin_work or error( $dbh->error ); # and start a new one
}
$dbh->query(
### keep counting how many we inserted
unless( ++$txn_count % TXN_COMMIT ) {
#warn "Committing transaction $txn_count";
- $dbh->query('COMMIT') or error( $dbh->error ); # commit previous transaction
- $dbh->query('BEGIN') or error( $dbh->error ); # and start a new one
+ $dbh->commit or error( $dbh->error ); # commit previous transaction
+ $dbh->begin_work or error( $dbh->error ); # and start a new one
}
$dbh->query(
error( $dbh->error );
return;
};
-
+
+ $dbh->query( qq[
+ /* the module index */
+ CREATE INDEX IX_module_module ON module (
+ module
+ );
+
+ \n]
+
+ ) or do {
+ error( $dbh->error );
+ return;
+ };
+
+ $dbh->query( qq[
+ /* the version index */
+ CREATE INDEX IX_module_version ON module (
+ version
+ );
+
+ \n]
+
+ ) or do {
+ error( $dbh->error );
+ return;
+ };
+
+ $dbh->query( qq[
+ /* the module-version index */
+ CREATE INDEX IX_module_module_version ON module (
+ module, version
+ );
+
+ \n]
+
+ ) or do {
+ error( $dbh->error );
+ return;
+ };
+
return 1;
}
use CPANPLUS::Error;
use CPANPLUS::Internals::Constants;
-use Cwd qw[chdir];
+use Cwd qw[chdir cwd];
use File::Copy;
use Params::Check qw[check];
use Module::Load::Conditional qw[can_load];
$self->extract( %$params ) or return;
}
+ $args->{'prereq_format'} = $format if $format;
$format ||= $self->status->installer_type;
unless( $format ) {
use Params::Check qw[check];
use IPC::Cmd qw[can_run];
use CPANPLUS::Error qw[error msg];
+use Module::Load::Conditional qw[check_install];
use Locale::Maketext::Simple Class => 'CPANPLUS', Style => 'gettext';
use CPANPLUS::Internals::Constants;
'Locale::Maketext::Simple' => '0.01',
'Log::Message' => '0.01',
'Module::Load' => '0.10',
- 'Module::Load::Conditional' => '0.31_01', # returns dir for loaded
+ 'Module::Load::Conditional' => '0.38', # returns dir for loaded
# modules
'version' => '0.73', # needed for M::L::C
# addresses #24630 and
'Module::Loaded' => '0.01',
'Parse::CPAN::Meta' => '0.02', # config_requires support
'ExtUtils::Install' => '1.42', # uninstall outside @INC
+ ( check_install( module => 'CPANPLUS::Dist::Build' )
+ ? ( 'CPANPLUS::Dist::Build' => '0.24' ) : () ),
},
features => {
BEGIN {
use vars qw[ $VERSION @ISA ];
@ISA = qw[ CPANPLUS::Shell::_Base::ReadLine ];
- $VERSION = "0.90";
+ $VERSION = "0.9005";
}
load CPANPLUS::Shell;
my ($type,$key,$value) = $input =~ m/(\w+)\s*(\w*)\s*(.*?)$/;
$value =~ s/\s+$//g if $value;
+ $type = '' unless defined $type;
$type = lc $type;
if( $type eq 'reconfigure' ) {
" Dist installation failed recorded ok" ) },
],
- "Set dependency to be perl-core" => [
- sub { $cb->module_tree( $ModPrereq )->package(
- 'perl-5.8.1.tar.gz' ); 'install' },
- sub { like( CPANPLUS::Error->stack_as_string,
- qr/Prerequisite '$ModPrereq' is perl-core/s,
- " Dist installation failed recorded ok" ) },
- ],
'Simple ignore' => [
sub { 'ignore' },
sub { ok( !$_[0]->status->prepared,
" Module status says installed" ) },
],
+ "Set dependency to be perl-core" => [
+ sub { $cb->module_tree( $ModPrereq )->package(
+ 'perl-5.8.1.tar.gz' ); 'install' },
+ sub { like( CPANPLUS::Error->stack_as_string,
+ qr/Prerequisite '$ModPrereq' is perl-core/s,
+ " Dist installation failed recorded ok" ) },
+ ],
+
'Install from conf' => [
sub { $conf->set_conf(prereqs => PREREQ_INSTALL); '' },
sub { ok( $_[0]->status->prepared,
### test non-relevant tests ###
my $cp = $Mod->clone;
- $cp->module( $Mod->module . '::' . ($^O eq 'beos' ? 'MSDOS' : 'Be') );
+ $cp->module( ($^O eq 'beos' ? 'MSDOS' : 'Be') . '::' . $cp->module );
ok(!RELEVANT_TEST_RESULT->($cp),"Test is irrelevant");
}
### and friends get picked up
$old_env_path = $ENV{PATH};
if ( $ENV{PERL_CORE} ) {
- $ENV{'PATH'} = join $Config{'path_sep'},
+ $ENV{'PATH'} = join $Config{'path_sep'},
grep { defined } "$FindBin::Bin/../../../utils", $ENV{'PATH'};
}
else {
- $ENV{'PATH'} = join $Config{'path_sep'},
+ $ENV{'PATH'} = join $Config{'path_sep'},
grep { defined } "$FindBin::Bin/../bin", $ENV{'PATH'};
}
projects / platform / upstream / perl.git / commitdiff