In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/6c52f6c9a260e34e5fe12222a09c91d217628a9f?hp=2ef12107cecdf4077410a083797114ab9bbc043c>
- Log ----------------------------------------------------------------- commit 6c52f6c9a260e34e5fe12222a09c91d217628a9f Author: Chris 'BinGOs' Williams <[email protected]> Date: Sun Sep 1 11:45:24 2013 +0100 Update Module-Load-Conditional to CPAN version 0.58 [DELTA] Changes for 0.58 Sun Sep 1 11:21:59 BST 2013 ================================================= * RT#83728 make quoting work portably and remove prototypes from one-liner in requires() ----------------------------------------------------------------------- Summary of changes: Porting/Maintainers.pl | 2 +- cpan/Module-Load-Conditional/lib/Module/Load/Conditional.pm | 10 ++++++---- pod/perldelta.pod | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 70bdefa..1bc5dea 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -1216,7 +1216,7 @@ use File::Glob qw(:case); 'Module::Load::Conditional' => { 'MAINTAINER' => 'kane', - 'DISTRIBUTION' => 'BINGOS/Module-Load-Conditional-0.56.tar.gz', + 'DISTRIBUTION' => 'BINGOS/Module-Load-Conditional-0.58.tar.gz', 'FILES' => q[cpan/Module-Load-Conditional], 'UPSTREAM' => 'cpan', }, diff --git a/cpan/Module-Load-Conditional/lib/Module/Load/Conditional.pm b/cpan/Module-Load-Conditional/lib/Module/Load/Conditional.pm index a94906c..c890df0 100644 --- a/cpan/Module-Load-Conditional/lib/Module/Load/Conditional.pm +++ b/cpan/Module-Load-Conditional/lib/Module/Load/Conditional.pm @@ -13,14 +13,16 @@ use version; use Module::Metadata (); -use constant ON_VMS => $^O eq 'VMS'; +use constant ON_VMS => $^O eq 'VMS'; +use constant ON_WIN32 => $^O eq 'MSWin32' ? 1 : 0; +use constant QUOTE => do { ON_WIN32 ? q["] : q['] }; BEGIN { use vars qw[ $VERSION @ISA $VERBOSE $CACHE @EXPORT_OK $DEPRECATED $FIND_VERSION $ERROR $CHECK_INC_HASH]; use Exporter; @ISA = qw[Exporter]; - $VERSION = '0.56'; + $VERSION = '0.58'; $VERBOSE = 0; $DEPRECATED = 0; $FIND_VERSION = 1; @@ -495,8 +497,8 @@ sub requires { } my $lib = join " ", map { qq["-I$_"] } @INC; - my $oneliner = 'sub foo(_){q[BONG=].shift} print(join(qq[\n],map foo,keys(%INC)),qq[\n])'; - my $cmd = qq["$^X" $lib -M$who -e"$oneliner"]; + my $oneliner = 'print(join(qq[\n],map{qq[BONG=$_]}keys(%INC)),qq[\n])'; + my $cmd = join '', qq["$^X" $lib -M$who -e], QUOTE, $oneliner, QUOTE; return sort grep { !/^$who$/ } diff --git a/pod/perldelta.pod b/pod/perldelta.pod index fc07985..f3459d8 100644 --- a/pod/perldelta.pod +++ b/pod/perldelta.pod @@ -252,7 +252,7 @@ The list of Perl versions covered has been updated. =item * -L<Module::Load::Conditional> has been upgraded from version 0.54 to 0.56. +L<Module::Load::Conditional> has been upgraded from version 0.54 to 0.58. C<requires> has been made more robust. [cpan #83728] -- Perl5 Master Repository
