From: Andreas König Date: Sat, 3 Dec 2005 12:24:05 +0000 (+0100) Subject: [PAUSE] CPAN Upload: A/AN/ANDK/CPAN-1.80.tar.gz X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=ec5fee461a5f1addabf15a3f9a2832a74bed5afe;p=p5sagit%2Fp5-mst-13.2.git [PAUSE] CPAN Upload: A/AN/ANDK/CPAN-1.80.tar.gz Message-ID: <87mzji8luy.fsf@k75.linux.bogus> p4raw-id: //depot/perl@26254 --- diff --git a/lib/CPAN.pm b/lib/CPAN.pm index 67a1ddd..6c79d6f 100644 --- a/lib/CPAN.pm +++ b/lib/CPAN.pm @@ -1,6 +1,6 @@ # -*- Mode: cperl; coding: utf-8; cperl-indent-level: 4 -*- package CPAN; -$VERSION = '1.76_65'; +$VERSION = '1.80'; $VERSION = eval $VERSION; use CPAN::Version; @@ -57,7 +57,7 @@ $CPAN::Defaultrecent ||= "http://search.cpan.org/recent"; package CPAN; -use strict qw(vars); +use strict; use vars qw($VERSION @EXPORT $AUTOLOAD $DEBUG $META $HAS_USABLE $term $Signal $End $Suppress_readline $Frontend @@ -752,7 +752,7 @@ sub has_usable { sub {require HTTP::Request}, sub {require URI::URL}, ], - Net::FTP => [ + 'Net::FTP' => [ sub {require Net::FTP}, sub {require Net::Config}, ] @@ -803,7 +803,7 @@ sub has_inst { $CPAN::Frontend->myprint("CPAN: $mod loaded ok\n"); if ($mod eq "CPAN::WAIT") { - push @CPAN::Shell::ISA, CPAN::WAIT; + push @CPAN::Shell::ISA, 'CPAN::WAIT'; } return 1; } elsif ($mod eq "Net::FTP") { @@ -1435,23 +1435,24 @@ Display Information i WORD or /REGEXP/ about any of the above r NONE report updatable modules ls AUTHOR about files in the author's directory - recent NONE latest CPAN uploads + (with WORD being a module, bundle or author name or a distribution + name of the form AUTHOR/DISTRIBUTION) Download, Test, Make, Install... - get download - make make (implies get) - test MODULES, make test (implies make) - install DISTS, BUNDLES make install (implies test) - clean make clean - look open subshell in these dists' directories - readme display these dists' README files - perldoc display module's POD documentation + get download clean make clean + make make (implies get) look open subshell in dist directory + test make test (implies make) readme display these README files + install make install (implies test) perldoc display POD documentation + +Pragmas + force COMMAND unconditionally do command + notest COMMAND skip testing Other h,? display this menu ! perl-code eval a perl command o conf [opt] set and query options q quit the cpan shell reload cpan load CPAN.pm again reload index load newer indices - autobundle Snapshot force cmd unconditionally do cmd}); + autobundle Snapshot recent latest CPAN uploads}); } } @@ -3323,7 +3324,7 @@ sub rd_authindex { return unless defined $index_target; $CPAN::Frontend->myprint("Going to read $index_target\n"); local(*FH); - tie *FH, CPAN::Tarzip, $index_target; + tie *FH, 'CPAN::Tarzip', $index_target; local($/) = "\n"; push @lines, split /\012/ while ; foreach (@lines) { @@ -3401,7 +3402,7 @@ happen.\a $last_updated); $DATE_OF_02 = $last_updated; - if ($CPAN::META->has_inst(HTTP::Date)) { + if ($CPAN::META->has_inst('HTTP::Date')) { require HTTP::Date; my($age) = (time - HTTP::Date::str2time($last_updated))/3600/24; if ($age > 30) { @@ -3475,9 +3476,13 @@ happen.\a } - if ($id->cpan_file ne $dist){ # update only if file is - # different. CPAN prohibits same - # name with different version + # Although CPAN prohibits same name with different version the + # indexer may have changed the version for the same distro + # since the last time ("Force Reindexing" feature) + if ($id->cpan_file ne $dist + || + $id->cpan_version ne $version + ){ $userid = $id->userid || $self->userid($dist); $id->set( 'CPAN_USERID' => $userid, @@ -5561,7 +5566,7 @@ explicitly a file $s. $self->debug("type[$type] s[$s]") if $CPAN::DEBUG; my $obj = $CPAN::META->instance($type,$s); $obj->$meth(); - if ($obj->isa(CPAN::Bundle) + if ($obj->isa('CPAN::Bundle') && exists $obj->{install_failed} && diff --git a/lib/CPAN/SIGNATURE b/lib/CPAN/SIGNATURE index 3690614..f891da9 100644 --- a/lib/CPAN/SIGNATURE +++ b/lib/CPAN/SIGNATURE @@ -14,37 +14,38 @@ not run its Makefile.PL or Build.PL. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -SHA1 a54a2d61e3ab59c7e24a24b9995132b221038f39 ChangeLog +SHA1 b027e03cecaa51fa1ad8f028c22ac3ed664768f2 ChangeLog SHA1 9b97524a7a91c815e46b19302a33829d3c26bbbf ChangeLog.old SHA1 a029ffa2f2252bb8914eb658666244710994d256 Changes.old -SHA1 86ca1e7f1afbf3f9829eadc046d52774fa604ca8 MANIFEST +SHA1 f94cbfebb56cbb0b32abf4886e8019dad5969335 MANIFEST SHA1 c4090d00f577a0c5b562899afb75abc626805eb6 MANIFEST.SKIP -SHA1 929940208ad7f6acb53fb4d9e717af5f32b16a57 META.yml -SHA1 f9c7519871a5e7adc40d1591dc75f6fa2e16d82a Makefile.PL +SHA1 dfd45cc52c5b9e6574002e4c9269a861afe58a13 META.yml +SHA1 53a895175db81affb3c146e35db1fd21c3300bba Makefile.PL SHA1 37e858c51409a297ef5d3fb35dc57cd3b57f9a4d PAUSE2003.pub SHA1 af016003ad503ed078c5f8254521d13a3e0c494f PAUSE2005.pub SHA1 8461a8f84cbc764d7c10a2ab1de26e0099a68c77 README -SHA1 5adbf645e60685d6552fbcfff6e577399fe1f958 Releasenotes -SHA1 078d56fd1f2105c148115fe3965d026b61e82bf1 Todo +SHA1 7268f99398cca7d8bbc8ef7b0fd46ddc1edcc5d3 Releasenotes +SHA1 dc97f039e581bf15958b97d992dc6d77aee7459a Todo SHA1 efbe8e6882a2caa0d741b113959a706830ab5882 inc/Test/Builder.pm SHA1 ae1d68262bedc2475e2c6fd478d99b259b4fb109 inc/Test/More.pm SHA1 859ee1f3ba026d269c44b29d715d9af1e35333bc lib/Bundle/CPAN.pm -SHA1 c1d69e71005cd3785aab81d522d02d8bfd28e0d3 lib/CPAN.pm +SHA1 af1eead07bc81f265ac6c10ba5edd1608f519163 lib/CPAN.pm SHA1 104fd2b39fdba692143655b53bcf01d36c8ebf68 lib/CPAN/Admin.pm SHA1 a09f2474f4be085c40790af007a7163558f52eef lib/CPAN/FirstTime.pm SHA1 4fa9695417b54fc8d4e29684ad61689bc108274b lib/CPAN/Nox.pm -SHA1 f703cd15b95c5fd4ca6c0576b8b4566501882ccf lib/CPAN/Version.pm +SHA1 174b3501753423eb90914fb5be043b79e405af28 lib/CPAN/Version.pm SHA1 bdaa092be8b158a7c2141c873b2dbd76066f3f8f scripts/cpan SHA1 67e80e1cfc3530932de7743dd0c833b2c387609d t/Nox.t SHA1 215dace24b507de20011d36cbe2d16ddea78bcf3 t/loadme.t SHA1 9e7950a79a153b532c5094c7091757d51040b218 t/mirroredby.t +SHA1 6a79f15a10337bd3450604abf39d4462df2a550b t/pod.t SHA1 952e77e7944637eed1b5d202afa98baef8a4c64c t/signature.t SHA1 d773586d80dbd79605a4b08c3ef310379c4d09c5 t/vcmp.t SHA1 b505a0db80ed4c835ad5676e9d1cbf09c86e6c34 t/version.t -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDb9HB7IA58KMXwV0RAjh7AKCj/RkAnuj3fdKb2yoOOGB8reorJQCfQK82 -o/ldf0WnbrRG65kf3p7s15Q= -=sAqA +iD8DBQFDkW5y7IA58KMXwV0RAt8IAJ9/CRf2nVwzXzwz9c9n1J/D1gbnpgCg3yss ++fc+FFKL72M5z59yvC62HcE= +=RP0L -----END PGP SIGNATURE----- diff --git a/lib/CPAN/Version.pm b/lib/CPAN/Version.pm index 14c5bf4..f47c7c6 100644 --- a/lib/CPAN/Version.pm +++ b/lib/CPAN/Version.pm @@ -30,8 +30,9 @@ version strings visible and comparable. package CPAN::Version; +use strict; use vars qw($VERSION); -$VERSION = sprintf "%.2f", substr(q$Rev: 231 $,4)/100; +$VERSION = sprintf "%.2f", substr(q$Rev: 254 $,4)/100; # CPAN::Version::vcmp courtesy Jost Krieger sub vcmp {