Commit 66ae8743 authored by msvensson@pilot.(none)'s avatar msvensson@pilot.(none)

Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
parents 45667e64 0ccf3502
...@@ -204,22 +204,15 @@ sub mtr_copy_dir($$) { ...@@ -204,22 +204,15 @@ sub mtr_copy_dir($$) {
sub mtr_rmtree($) { sub mtr_rmtree($) {
my ($dir)= @_; my ($dir)= @_;
my $need_file_find= 0;
mtr_verbose("mtr_rmtree: $dir"); mtr_verbose("mtr_rmtree: $dir");
{
# Try to use File::Path::rmtree. Recent versions # Try to use File::Path::rmtree. Recent versions
# handles removal of directories and files that don't # handles removal of directories and files that don't
# have full permissions, while older versions # have full permissions, while older versions
# may have a problem with that and we use our own version # may have a problem with that and we use our own version
local $SIG{__WARN__}= sub { eval { rmtree($dir); };
$need_file_find= 1; if ( $@ ) {
mtr_warning($_[0]);
};
rmtree($dir);
}
if ( $need_file_find ) {
mtr_warning("rmtree($dir) failed, trying with File::Find..."); mtr_warning("rmtree($dir) failed, trying with File::Find...");
my $errors= 0; my $errors= 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment