Commit b3273629 authored by unknown's avatar unknown

Move the check that $opt_vardir could be created and was writable to the function

where we know how to creat the vardir 
Remove unused variable

parent e789cdaa
...@@ -1883,7 +1883,6 @@ sub kill_running_servers () { ...@@ -1883,7 +1883,6 @@ sub kill_running_servers () {
} }
} }
# #
# Remove var and any directories in var/ created by previous # Remove var and any directories in var/ created by previous
# tests # tests
...@@ -1935,7 +1934,6 @@ sub remove_stale_vardir () { ...@@ -1935,7 +1934,6 @@ sub remove_stale_vardir () {
mtr_error("The destination for symlink $opt_vardir does not exist") mtr_error("The destination for symlink $opt_vardir does not exist")
if ! -d readlink($opt_vardir); if ! -d readlink($opt_vardir);
my $dir= shift;
foreach my $bin ( glob("$opt_vardir/*") ) foreach my $bin ( glob("$opt_vardir/*") )
{ {
mtr_verbose("Removing bin $bin"); mtr_verbose("Removing bin $bin");
...@@ -1997,6 +1995,19 @@ sub setup_vardir() { ...@@ -1997,6 +1995,19 @@ sub setup_vardir() {
} }
} }
if ( ! -d $opt_vardir )
{
mtr_verbose("Creating $opt_vardir");
mkpath($opt_vardir);
}
# Ensure a proper error message if vardir couldn't be created
unless ( -d $opt_vardir and -w $opt_vardir )
{
mtr_error("Writable 'var' directory is needed, use the " .
"'--vardir=<path>' option");
}
mkpath("$opt_vardir/log"); mkpath("$opt_vardir/log");
mkpath("$opt_vardir/run"); mkpath("$opt_vardir/run");
mkpath("$opt_vardir/tmp"); mkpath("$opt_vardir/tmp");
......
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