In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/8376a7bfebc88cd8955782fa2c6b6ce3a54a7cb0?hp=1a13b0759af8c958576ca1da3d406f7abdf9d241>
- Log ----------------------------------------------------------------- commit 8376a7bfebc88cd8955782fa2c6b6ce3a54a7cb0 Author: Ricardo Signes <[email protected]> Date: Sun Apr 15 21:31:08 2012 -0400 make Pod-Html's _unixify normalize Win32 drive letters Okay, look, this is kind of stupid and horrible, but it should stop smoke failures and actually address some forms of failed path comparisons in Pod::Html. In reality, we should be doing better path comparisons than checking substr and eq, but that's not going to get properly overhauled at this late date. In the meantime, this should fix Win32 smokers with forcibly lc()-ed cwds without breaking anybodye else, right? Right! ----------------------------------------------------------------------- Summary of changes: ext/Pod-Html/lib/Pod/Html.pm | 3 ++- ext/Pod-Html/t/crossref2.t | 2 +- ext/Pod-Html/t/pod2html-lib.pl | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ext/Pod-Html/lib/Pod/Html.pm b/ext/Pod-Html/lib/Pod/Html.pm index c16b657..f669873 100644 --- a/ext/Pod-Html/lib/Pod/Html.pm +++ b/ext/Pod-Html/lib/Pod/Html.pm @@ -3,7 +3,7 @@ use strict; require Exporter; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); -$VERSION = 1.15_01; +$VERSION = 1.15_02; @ISA = qw(Exporter); @EXPORT = qw(pod2html htmlify); @EXPORT_OK = qw(anchorify); @@ -677,6 +677,7 @@ sub _unixify { : File::Spec->splitdir($dirs); if (defined($vol) && $vol) { $vol =~ s/:$// if $^O eq 'VMS'; + $vol = uc $vol if $^O eq 'MSWin32'; if( $dirs[0] ) { unshift @dirs, $vol; diff --git a/ext/Pod-Html/t/crossref2.t b/ext/Pod-Html/t/crossref2.t index 3257928..ce8fd6f 100644 --- a/ext/Pod-Html/t/crossref2.t +++ b/ext/Pod-Html/t/crossref2.t @@ -18,7 +18,7 @@ SKIP: { my $output = make_test_dir(); skip "$output", 1 if $output; - my $cwd = cwd(); + my $cwd = Pod::Html::_unixify(cwd()); convert_n_test("crossref", "cross references", "--podpath=t:testdir/test.lib", diff --git a/ext/Pod-Html/t/pod2html-lib.pl b/ext/Pod-Html/t/pod2html-lib.pl index b7067da..c60cab6 100644 --- a/ext/Pod-Html/t/pod2html-lib.pl +++ b/ext/Pod-Html/t/pod2html-lib.pl @@ -30,7 +30,7 @@ sub rem_test_dir { sub convert_n_test { my($podfile, $testname, @p2h_args) = @_; - my $cwd = Cwd::cwd(); + my $cwd = Pod::Html::_unixify( Cwd::cwd() ); my ($vol, $dir) = splitpath($cwd, 1); my $relcwd = substr($dir, length(File::Spec->rootdir())); -- Perl5 Master Repository
