From: Chris 'BinGOs' Williams Date: Sat, 25 Jan 2014 13:37:15 +0000 (+0000) Subject: Update Module-Load-Conditional to CPAN version 0.62 X-Git-Tag: upstream/5.20.0~624 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=055530663a9e1559574d3e02e0deabdbee588f2e;p=platform%2Fupstream%2Fperl.git Update Module-Load-Conditional to CPAN version 0.62 [DELTA] 0.62 Fri Jan 24 15:52:44 GMT 2014 * Resolve test failures on v5.16.x --- diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 0eee41f..0ac622c 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -814,7 +814,7 @@ use File::Glob qw(:case); }, 'Module::Load::Conditional' => { - 'DISTRIBUTION' => 'BINGOS/Module-Load-Conditional-0.60.tar.gz', + 'DISTRIBUTION' => 'BINGOS/Module-Load-Conditional-0.62.tar.gz', 'FILES' => q[cpan/Module-Load-Conditional], }, diff --git a/cpan/Module-Load-Conditional/lib/Module/Load/Conditional.pm b/cpan/Module-Load-Conditional/lib/Module/Load/Conditional.pm index 6e60998..422f56b 100644 --- a/cpan/Module-Load-Conditional/lib/Module/Load/Conditional.pm +++ b/cpan/Module-Load-Conditional/lib/Module/Load/Conditional.pm @@ -22,7 +22,7 @@ BEGIN { $FIND_VERSION $ERROR $CHECK_INC_HASH]; use Exporter; @ISA = qw[Exporter]; - $VERSION = '0.60'; + $VERSION = '0.62'; $VERBOSE = 0; $DEPRECATED = 0; $FIND_VERSION = 1; diff --git a/cpan/Module-Load-Conditional/t/01_Module_Load_Conditional.t b/cpan/Module-Load-Conditional/t/01_Module_Load_Conditional.t index 1b8728f..1bfa1a1 100644 --- a/cpan/Module-Load-Conditional/t/01_Module_Load_Conditional.t +++ b/cpan/Module-Load-Conditional/t/01_Module_Load_Conditional.t @@ -281,8 +281,8 @@ SKIP:{ local $Module::Load::Conditional::CHECK_INC_HASH = 1; { package A::B::C::D; - $A::B::C::D::VERSION = $$; - $INC{'A/B/C/D.pm'} = $$.$$; + $A::B::C::D::VERSION = "$$"; + $INC{'A/B/C/D.pm'} = "$$"."$$"; ### XXX this is no longer needed with M::Load 0.11_01 #$INC{'[.A.B.C]D.pm'} = $$.$$ if $^O eq 'VMS'; @@ -291,8 +291,8 @@ SKIP:{ my $href = check_install( module => 'A::B::C::D', version => 0 ); ok( $href, 'Found package in %INC' ); - is( $href->{'file'}, $$.$$, ' Found correct file' ); - is( $href->{'version'}, $$, ' Found correct version' ); + is( $href->{'file'}, "$$"."$$", ' Found correct file' ); + is( $href->{'version'}, "$$", ' Found correct version' ); ok( $href->{'uptodate'}, ' Marked as uptodate' ); ok( can_load( modules => { 'A::B::C::D' => 0 } ), ' can_load successful' );