mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 18:41:56 +01:00
Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/merge-4.1
Build-tools/Do-compile: Auto merged
This commit is contained in:
commit
12df0887b1
1 changed files with 4 additions and 2 deletions
|
@ -806,7 +806,7 @@ sub find
|
||||||
sub rm_all
|
sub rm_all
|
||||||
{
|
{
|
||||||
my(@rm_files)=@_;
|
my(@rm_files)=@_;
|
||||||
my($dir,$current_dir,@files,@dirs);
|
my($dir,$current_dir,@files,@dirs,$removed);
|
||||||
$current_dir = `pwd`; chomp($current_dir);
|
$current_dir = `pwd`; chomp($current_dir);
|
||||||
|
|
||||||
foreach $dir (@rm_files)
|
foreach $dir (@rm_files)
|
||||||
|
@ -830,7 +830,9 @@ sub rm_all
|
||||||
}
|
}
|
||||||
if ($#files >= 0)
|
if ($#files >= 0)
|
||||||
{
|
{
|
||||||
system("rm -f " . join(" ",@files)) && abort("Can't remove files from $dir");
|
$removed= unlink @files;
|
||||||
|
print "rm_all : removed $removed files in $current_dir/$dir\n" if ($opt_debug);
|
||||||
|
abort("Can't remove all $#files+1 from $current_dir/$dir, just $removed") if $removed != $#files+1;
|
||||||
}
|
}
|
||||||
foreach $dir (@dirs)
|
foreach $dir (@dirs)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Reference in a new issue