summaryrefslogtreecommitdiff
path: root/Build-tools
diff options
context:
space:
mode:
authorunknown <joerg@mysql.com>2005-02-11 13:00:17 +0100
committerunknown <joerg@mysql.com>2005-02-11 13:00:17 +0100
commit12e4d1c8db989fb1f5a73b7fa1a48ff73cdebe48 (patch)
tree2de16644d57b01c889fbf4f1b8137bc653de00b9 /Build-tools
parent58de6bb98b9671d50ac639b22dbf3c6d40dc2c88 (diff)
parent12df0887b1665235b9fb59ab053db8f223892f76 (diff)
downloadmariadb-git-12e4d1c8db989fb1f5a73b7fa1a48ff73cdebe48.tar.gz
Merge mysql.com:/M41/upward-4.1 into mysql.com:/M50/merge-5.0
Build-tools/Do-compile: Auto merged
Diffstat (limited to 'Build-tools')
-rwxr-xr-xBuild-tools/Do-compile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Build-tools/Do-compile b/Build-tools/Do-compile
index 8f1e5a6a8ef..c7cba7f967f 100755
--- a/Build-tools/Do-compile
+++ b/Build-tools/Do-compile
@@ -811,7 +811,7 @@ sub find
sub rm_all
{
my(@rm_files)=@_;
- my($dir,$current_dir,@files,@dirs);
+ my($dir,$current_dir,@files,@dirs,$removed);
$current_dir = `pwd`; chomp($current_dir);
foreach $dir (@rm_files)
@@ -835,7 +835,9 @@ sub rm_all
}
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)
{