Re: [PATCH] Update File-Path to 2.00

Message-ID: <4661BDC8.6040102@landgren.net>

p4raw-id: //depot/perl@31329

diff --git a/lib/File/Path.pm b/lib/File/Path.pm
index e5b2dfd..ad0a38d 100644 (file)
--- a/lib/File/Path.pm
+++ b/lib/File/Path.pm
@@ -18,7 +18,7 @@ This document describes version 2.00 of File::Path, released
 
     rmtree(
         'foo/bar/baz', '/zug/zwang',
-        { verbose => 1, errors  => \my $err_list }
+        { verbose => 1, error  => \my $err_list }
     );
 
     # traditional
@@ -362,10 +362,7 @@ use strict;
 use File::Basename ();
 use File::Spec     ();
 BEGIN {
-    if ($] >= 5.006) {
-        eval "use warnings";
-    }
-    else {
+    if ($] < 5.006) {
         # can't say 'opendir my $dh, $dirname'
         # need to initialise $dh
         eval "use Symbol";

diff --git a/lib/File/Path.t b/lib/File/Path.t
index 6162cba..ce85b73 100755 (executable)
--- a/lib/File/Path.t
+++ b/lib/File/Path.t
@@ -64,7 +64,8 @@ SKIP: {
     # IOW: File::Spec->catdir( qw(foo bar), File::Spec->updir ) eq 'foo'
     # rather than foo/bar/..    
     skip "updir() canonicalises path on this platform", 2
-        if $dir2 eq $tmp_base;
+        if $dir2 eq $tmp_base
+            or $^O eq 'cygwin';
         
     @created = mkpath($dir2, {mask => 0700});
     is(scalar(@created), 1, "make directory with trailing parent segment");