summaryrefslogtreecommitdiff
path: root/cpan
diff options
context:
space:
mode:
authorCraig A. Berry <craigberry@mac.com>2009-11-20 22:14:21 -0600
committerCraig A. Berry <craigberry@mac.com>2009-11-20 22:14:21 -0600
commit52bbce6d8fa698c93c0072230ffd19aba925088b (patch)
tree0b000154387362e3c0c22ca3ceff136d74d1098b /cpan
parent4ebea3c679ca93eb90d62be76bf8eb3cd7d14160 (diff)
downloadperl-52bbce6d8fa698c93c0072230ffd19aba925088b.tar.gz
Avoid logical name conflicts in File::Path::_rmtree on VMS.
already submitted upstream at: http://rt.cpan.org/Public/Bug/Display.html?id=51588
Diffstat (limited to 'cpan')
-rw-r--r--cpan/File-Path/lib/File/Path.pm5
1 files changed, 2 insertions, 3 deletions
diff --git a/cpan/File-Path/lib/File/Path.pm b/cpan/File-Path/lib/File/Path.pm
index 387cdb19cb..5a9a88e402 100644
--- a/cpan/File-Path/lib/File/Path.pm
+++ b/cpan/File-Path/lib/File/Path.pm
@@ -17,7 +17,7 @@ BEGIN {
use Exporter ();
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
-$VERSION = '2.08';
+$VERSION = '2.08_01';
@ISA = qw(Exporter);
@EXPORT = qw(mkpath rmtree);
@EXPORT_OK = qw(make_path remove_tree);
@@ -279,7 +279,7 @@ sub _rmtree {
my ($ldev, $lino, $perm) = (lstat $root)[0,1,2] or next ROOT_DIR;
if ( -d _ ) {
- $root = VMS::Filespec::pathify($root) if $Is_VMS;
+ $root = VMS::Filespec::vmspath(VMS::Filespec::pathify($root)) if $Is_VMS;
if (!chdir($root)) {
# see if we can escalate privileges to get in
@@ -343,7 +343,6 @@ sub _rmtree {
# filesystems is faster if done in reverse ASCIIbetical order.
# include '.' to '.;' from blead patch #31775
@files = map {$_ eq '.' ? '.;' : $_} reverse @files;
- ($root = VMS::Filespec::unixify($root)) =~ s/\.dir\z//;
}
@files = grep {$_ ne $updir and $_ ne $curdir} @files;