Change 31723 by [EMAIL PROTECTED] on 2007/08/15 16:17:13
Upgrade to CPANPLUS-0.82
Affected files ...
... //depot/perl/lib/CPANPLUS.pm#8 edit
... //depot/perl/lib/CPANPLUS/Backend.pm#2 edit
... //depot/perl/lib/CPANPLUS/Config.pm#7 edit
... //depot/perl/lib/CPANPLUS/Configure.pm#3 edit
... //depot/perl/lib/CPANPLUS/Internals.pm#8 edit
... //depot/perl/lib/CPANPLUS/Shell/Default.pm#8 edit
... //depot/perl/lib/CPANPLUS/Shell/Default/Plugins/Remote.pm#2 edit
... //depot/perl/lib/CPANPLUS/t/dummy-CPAN/authors/01mailrc.txt.gz.packed#8 edit
...
//depot/perl/lib/CPANPLUS/t/dummy-CPAN/authors/id/E/EU/EUNOXS/Bundle-Foo-Bar-0.01.tar.gz.packed#8
edit
...
//depot/perl/lib/CPANPLUS/t/dummy-CPAN/authors/id/E/EU/EUNOXS/Foo-Bar-0.01.tar.gz.packed#8
edit
...
//depot/perl/lib/CPANPLUS/t/dummy-CPAN/authors/id/E/EU/EUXS/Foo-Bar-0.01.tar.gz.packed#8
edit
...
//depot/perl/lib/CPANPLUS/t/dummy-CPAN/authors/id/M/MB/MBNOXS/Foo-Bar-0.01.tar.gz.packed#8
edit
...
//depot/perl/lib/CPANPLUS/t/dummy-CPAN/authors/id/M/MB/MBXS/Foo-Bar-0.01.tar.gz.packed#8
edit
...
//depot/perl/lib/CPANPLUS/t/dummy-CPAN/modules/02packages.details.txt.gz.packed#8
edit
... //depot/perl/lib/CPANPLUS/t/dummy-CPAN/modules/03modlist.data.gz.packed#8
edit
... //depot/perl/lib/CPANPLUS/t/inc/conf.pl#8 edit
Differences ...
==== //depot/perl/lib/CPANPLUS.pm#8 (text) ====
Index: perl/lib/CPANPLUS.pm
--- perl/lib/CPANPLUS.pm#7~31558~ 2007-07-07 02:44:34.000000000 -0700
+++ perl/lib/CPANPLUS.pm 2007-08-15 09:17:13.000000000 -0700
@@ -13,7 +13,7 @@
use vars qw( @EXPORT @ISA $VERSION );
@EXPORT = qw( shell fetch get install );
@ISA = qw( Exporter );
- $VERSION = "0.81_01"; #have to hardcode or cpan.org gets unhappy
+ $VERSION = "0.82"; #have to hardcode or cpan.org gets unhappy
}
### purely for backward compatibility, so we can call it from the commandline:
==== //depot/perl/lib/CPANPLUS/Backend.pm#2 (text) ====
Index: perl/lib/CPANPLUS/Backend.pm
--- perl/lib/CPANPLUS/Backend.pm#1~30883~ 2007-04-10 00:42:33.000000000
-0700
+++ perl/lib/CPANPLUS/Backend.pm 2007-08-15 09:17:13.000000000 -0700
@@ -380,7 +380,7 @@
=pod
-=head2 $mod_obj = $cb->parse_module( module => $modname|$distname|$modobj )
+=head2 $mod_obj = $cb->parse_module( module => $modname|$distname|$modobj|URI )
C<parse_module> tries to find a C<CPANPLUS::Module> object that
matches your query. Here's a list of examples you could give to
==== //depot/perl/lib/CPANPLUS/Config.pm#7 (text) ====
Index: perl/lib/CPANPLUS/Config.pm
--- perl/lib/CPANPLUS/Config.pm#6~31558~ 2007-07-07 02:44:34.000000000
-0700
+++ perl/lib/CPANPLUS/Config.pm 2007-08-15 09:17:13.000000000 -0700
@@ -568,8 +568,10 @@
### or user installs
### note that we don't use 'can_run' as it's
### not an executable, just a wrapper...
- for my $dir (split(/\Q$Config::Config{path_sep}\E/,
$ENV{PATH}),
- File::Spec->curdir
+ ### prefer anything that's found in the path paralel to your
$^X
+ for my $dir (File::Spec->rel2abs( dirname($^X) ),
+ split(/\Q$Config::Config{path_sep}\E/,
$ENV{PATH}),
+ File::Spec->curdir,
) {
$maybe = File::Spec->catfile( $dir, $bin );
$path = $maybe and last BIN if -f $maybe;
@@ -584,6 +586,8 @@
### cross your fingers...
### pass '-P' to perl: "run program through C
### preprocessor before compilation"
+ ### XXX using -P actually changes the way some Makefile.PLs
+ ### are executed, so don't do that... --kane
error(loc(
"Could not find the '%1' binary in your path".
"--this may be a problem.\n".
==== //depot/perl/lib/CPANPLUS/Configure.pm#3 (text) ====
Index: perl/lib/CPANPLUS/Configure.pm
--- perl/lib/CPANPLUS/Configure.pm#2~31292~ 2007-05-28 06:17:54.000000000
-0700
+++ perl/lib/CPANPLUS/Configure.pm 2007-08-15 09:17:13.000000000 -0700
@@ -463,18 +463,10 @@
Locations and names of source files remotely.
-=item _set|_get_dist
-
-Mapping of distribution format names to modules.
-
=item _set|_get_fetch
Special settings pertaining to the fetching of files.
-=item _set|_get_daemon
-
-Settings for C<cpanpd>, the CPANPLUS daemon.
-
=back
=cut
==== //depot/perl/lib/CPANPLUS/Internals.pm#8 (text) ====
Index: perl/lib/CPANPLUS/Internals.pm
--- perl/lib/CPANPLUS/Internals.pm#7~31558~ 2007-07-07 02:44:34.000000000
-0700
+++ perl/lib/CPANPLUS/Internals.pm 2007-08-15 09:17:13.000000000 -0700
@@ -40,7 +40,7 @@
CPANPLUS::Internals::Report
];
-$VERSION = "0.81_01";
+$VERSION = "0.82";
=pod
@@ -160,7 +160,7 @@
if( my $id = $class->_last_id ) {
# make it a singleton.
warn loc(q[%1 currently only supports one %2 object per ] .
- q[running program], 'CPANPLUS', $class);
+ qq[running program\n], 'CPANPLUS', $class);
return $class->_retrieve_id( $id );
}
==== //depot/perl/lib/CPANPLUS/Shell/Default.pm#8 (text) ====
Index: perl/lib/CPANPLUS/Shell/Default.pm
--- perl/lib/CPANPLUS/Shell/Default.pm#7~31558~ 2007-07-07 02:44:34.000000000
-0700
+++ perl/lib/CPANPLUS/Shell/Default.pm 2007-08-15 09:17:13.000000000 -0700
@@ -26,7 +26,7 @@
BEGIN {
use vars qw[ $VERSION @ISA ];
@ISA = qw[ CPANPLUS::Shell::_Base::ReadLine ];
- $VERSION = "0.81_01";
+ $VERSION = "0.82";
}
load CPANPLUS::Shell;
@@ -330,8 +330,10 @@
if( $key eq 'z' or
($key eq 's' and $input =~ /^\s*edit/)
) {
- print "\n", loc("Command not supported over remote
connection"),
- "\n\n";
+ print "\n",
+ loc( "Command '%1' not supported over remote
connection",
+ join ' ', $key, $input
+ ), "\n\n";
} else {
my($status,$buff) = $self->__send_remote_command($org_input);
==== //depot/perl/lib/CPANPLUS/Shell/Default/Plugins/Remote.pm#2 (text) ====
Index: perl/lib/CPANPLUS/Shell/Default/Plugins/Remote.pm
--- perl/lib/CPANPLUS/Shell/Default/Plugins/Remote.pm#1~30883~ 2007-04-10
00:42:33.000000000 -0700
+++ perl/lib/CPANPLUS/Shell/Default/Plugins/Remote.pm 2007-08-15
09:17:13.000000000 -0700
@@ -64,10 +64,8 @@
{ local $Params::Check::ALLOW_UNKNOWN = 1;
my $tmpl = {
- user => { default => $conf->_get_daemon('username'),
- store => \$user },
- pass => { default => $conf->_get_daemon('password'),
- store => \$pass },
+ user => { default => 'cpanpd', store => \$user },
+ pass => { required => 1, store => \$pass },
};
check( $tmpl, $opts ) or return;
@@ -75,7 +73,7 @@
my @parts = split /\s+/, $input;
my $host = shift @parts || 'localhost';
- my $port = shift @parts || $conf->_get_daemon('port');
+ my $port = shift @parts || '1337';
load IO::Socket;
@@ -114,7 +112,7 @@
### save the original prompt
$Saved_Prompt = $shell->prompt;
- $shell->prompt( $shell->brand .'@'. $host .'> ' );
+ $shell->prompt( $shell->brand .'@'. $host .':'. $port .'> ' );
} else {
print "\n$buffer\n\n";
==== //depot/perl/lib/CPANPLUS/t/dummy-CPAN/authors/01mailrc.txt.gz.packed#8
(text) ====
Index: perl/lib/CPANPLUS/t/dummy-CPAN/authors/01mailrc.txt.gz.packed
--- perl/lib/CPANPLUS/t/dummy-CPAN/authors/01mailrc.txt.gz.packed#7~31558~
2007-07-07 02:44:34.000000000 -0700
+++ perl/lib/CPANPLUS/t/dummy-CPAN/authors/01mailrc.txt.gz.packed
2007-08-15 09:17:13.000000000 -0700
@@ -10,7 +10,7 @@
uupacktool.pl -p lib/CPANPLUS/t/dummy-CPAN/authors/01mailrc.txt.gz
lib/CPANPLUS/t/dummy-CPAN/authors/01mailrc.txt.gz.packed
-Created at Sat Jul 7 11:15:17 2007
+Created at Wed Aug 15 16:13:41 2007
#########################################################################
__UU__
M'XL("%_EO$4``S`Q;6%I;')C+G1X=`!+S,E,+%9P#8T([EMAIL PROTECTED])=>*DM"2S)QB
====
//depot/perl/lib/CPANPLUS/t/dummy-CPAN/authors/id/E/EU/EUNOXS/Bundle-Foo-Bar-0.01.tar.gz.packed#8
(text) ====
Index:
perl/lib/CPANPLUS/t/dummy-CPAN/authors/id/E/EU/EUNOXS/Bundle-Foo-Bar-0.01.tar.gz.packed
---
perl/lib/CPANPLUS/t/dummy-CPAN/authors/id/E/EU/EUNOXS/Bundle-Foo-Bar-0.01.tar.gz.packed#7~31558~
2007-07-07 02:44:34.000000000 -0700
+++
perl/lib/CPANPLUS/t/dummy-CPAN/authors/id/E/EU/EUNOXS/Bundle-Foo-Bar-0.01.tar.gz.packed
2007-08-15 09:17:13.000000000 -0700
@@ -10,7 +10,7 @@
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 Sat Jul 7 11:15:17 2007
+Created at Wed Aug 15 16:13:41 2007
#########################################################################
__UU__
M'XL("!1%OT4"`T)U;F1L92U&;V\M0F%R+3`N,#$N=&%R`.V7:V_:,!2&^8I_
====
//depot/perl/lib/CPANPLUS/t/dummy-CPAN/authors/id/E/EU/EUNOXS/Foo-Bar-0.01.tar.gz.packed#8
(text) ====
Index:
perl/lib/CPANPLUS/t/dummy-CPAN/authors/id/E/EU/EUNOXS/Foo-Bar-0.01.tar.gz.packed
---
perl/lib/CPANPLUS/t/dummy-CPAN/authors/id/E/EU/EUNOXS/Foo-Bar-0.01.tar.gz.packed#7~31558~
2007-07-07 02:44:34.000000000 -0700
+++
perl/lib/CPANPLUS/t/dummy-CPAN/authors/id/E/EU/EUNOXS/Foo-Bar-0.01.tar.gz.packed
2007-08-15 09:17:13.000000000 -0700
@@ -10,7 +10,7 @@
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 Sat Jul 7 11:15:17 2007
+Created at Wed Aug 15 16:13:41 2007
#########################################################################
__UU__
M'XL("/8X34("`T9O;RU"87(M,"XP,2YT87(`[9KQ;]I&%,?Y^?Z*1YE$(A5C
====
//depot/perl/lib/CPANPLUS/t/dummy-CPAN/authors/id/E/EU/EUXS/Foo-Bar-0.01.tar.gz.packed#8
(text) ====
Index:
perl/lib/CPANPLUS/t/dummy-CPAN/authors/id/E/EU/EUXS/Foo-Bar-0.01.tar.gz.packed
---
perl/lib/CPANPLUS/t/dummy-CPAN/authors/id/E/EU/EUXS/Foo-Bar-0.01.tar.gz.packed#7~31558~
2007-07-07 02:44:34.000000000 -0700
+++
perl/lib/CPANPLUS/t/dummy-CPAN/authors/id/E/EU/EUXS/Foo-Bar-0.01.tar.gz.packed
2007-08-15 09:17:13.000000000 -0700
@@ -10,7 +10,7 @@
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 Sat Jul 7 11:15:17 2007
+Created at Wed Aug 15 16:13:41 2007
#########################################################################
__UU__
M'XL("`DY34("`T9O;RU"87(M,"XP,2YT87(`[5IK3]M(%,U7YE=<H%5``A.;
====
//depot/perl/lib/CPANPLUS/t/dummy-CPAN/authors/id/M/MB/MBNOXS/Foo-Bar-0.01.tar.gz.packed#8
(text) ====
Index:
perl/lib/CPANPLUS/t/dummy-CPAN/authors/id/M/MB/MBNOXS/Foo-Bar-0.01.tar.gz.packed
---
perl/lib/CPANPLUS/t/dummy-CPAN/authors/id/M/MB/MBNOXS/Foo-Bar-0.01.tar.gz.packed#7~31558~
2007-07-07 02:44:34.000000000 -0700
+++
perl/lib/CPANPLUS/t/dummy-CPAN/authors/id/M/MB/MBNOXS/Foo-Bar-0.01.tar.gz.packed
2007-08-15 09:17:13.000000000 -0700
@@ -10,7 +10,7 @@
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 Sat Jul 7 11:15:17 2007
+Created at Wed Aug 15 16:13:41 2007
#########################################################################
__UU__
M'XL("-<X34(``T9O;RU"87(M,"XP,2YT87(`[9E;;]HP%,=Y]J<[EMAIL PROTECTED]
====
//depot/perl/lib/CPANPLUS/t/dummy-CPAN/authors/id/M/MB/MBXS/Foo-Bar-0.01.tar.gz.packed#8
(text) ====
Index:
perl/lib/CPANPLUS/t/dummy-CPAN/authors/id/M/MB/MBXS/Foo-Bar-0.01.tar.gz.packed
---
perl/lib/CPANPLUS/t/dummy-CPAN/authors/id/M/MB/MBXS/Foo-Bar-0.01.tar.gz.packed#7~31558~
2007-07-07 02:44:34.000000000 -0700
+++
perl/lib/CPANPLUS/t/dummy-CPAN/authors/id/M/MB/MBXS/Foo-Bar-0.01.tar.gz.packed
2007-08-15 09:17:13.000000000 -0700
@@ -10,7 +10,7 @@
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 Sat Jul 7 11:15:17 2007
+Created at Wed Aug 15 16:13:41 2007
#########################################################################
__UU__
M'XL("-\X34(``T9O;RU"87(M,"XP,2YT87(`[5K_3QI)%/=7YZ]XU39H(BN[
====
//depot/perl/lib/CPANPLUS/t/dummy-CPAN/modules/02packages.details.txt.gz.packed#8
(text) ====
Index: perl/lib/CPANPLUS/t/dummy-CPAN/modules/02packages.details.txt.gz.packed
---
perl/lib/CPANPLUS/t/dummy-CPAN/modules/02packages.details.txt.gz.packed#7~31558~
2007-07-07 02:44:34.000000000 -0700
+++ perl/lib/CPANPLUS/t/dummy-CPAN/modules/02packages.details.txt.gz.packed
2007-08-15 09:17:13.000000000 -0700
@@ -10,7 +10,7 @@
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 Sat Jul 7 11:15:17 2007
+Created at Wed Aug 15 16:13:41 2007
#########################################################################
__UU__
M'XL("-%#OT4``S`R<&%C:V%G97,N9&5T86EL<RYT>'0`E=-1:[EMAIL PROTECTED]
==== //depot/perl/lib/CPANPLUS/t/dummy-CPAN/modules/03modlist.data.gz.packed#8
(text) ====
Index: perl/lib/CPANPLUS/t/dummy-CPAN/modules/03modlist.data.gz.packed
--- perl/lib/CPANPLUS/t/dummy-CPAN/modules/03modlist.data.gz.packed#7~31558~
2007-07-07 02:44:34.000000000 -0700
+++ perl/lib/CPANPLUS/t/dummy-CPAN/modules/03modlist.data.gz.packed
2007-08-15 09:17:13.000000000 -0700
@@ -10,7 +10,7 @@
uupacktool.pl -p lib/CPANPLUS/t/dummy-CPAN/modules/03modlist.data.gz
lib/CPANPLUS/t/dummy-CPAN/modules/03modlist.data.gz.packed
-Created at Sat Jul 7 11:15:18 2007
+Created at Wed Aug 15 16:13:41 2007
#########################################################################
__UU__
M'XL("#'FO$4``S`S;6]D;&ES="YD871A`%U3_6O;,!#].?HKCBXC"20A=<@&
==== //depot/perl/lib/CPANPLUS/t/inc/conf.pl#8 (text) ====
Index: perl/lib/CPANPLUS/t/inc/conf.pl
--- perl/lib/CPANPLUS/t/inc/conf.pl#7~31401~ 2007-06-17 05:51:30.000000000
-0700
+++ perl/lib/CPANPLUS/t/inc/conf.pl 2007-08-15 09:17:13.000000000 -0700
@@ -104,7 +104,11 @@
sub gimme_conf {
- my $conf = CPANPLUS::Configure->new();
+
+ ### don't load any other configs than the heuristic one
+ ### during tests. They might hold broken/incorrect data
+ ### for our test suite. Bug [perl #43629] showed this.
+ my $conf = CPANPLUS::Configure->new( load_configs => 0 );
$conf->set_conf( hosts => [ {
path => 'dummy-CPAN',
scheme => 'file',
End of Patch.
