Commit 9e455ff8 authored by gerv%gerv.net's avatar gerv%gerv.net

Bug 120537 (b) - fix previous patch to not complain if there's no .htaccess…

Bug 120537 (b) - fix previous patch to not complain if there's no .htaccess file. Patch by ddkilzer@theracingworld.com; r=justdave, bbaetz.
parent 9f62c083
......@@ -566,11 +566,13 @@ sub check_webdotbase {
return "The file path \"$value\" is not a valid executable. Please specify the complete file path to 'dot' if you intend to generate graphs locally.";
}
# Check .htaccess allows access to generated images
open HTACCESS, "data/webdot/.htaccess";
if(! grep(/png/,<HTACCESS>)) {
print "Dependency graph images are not accessible.\nDelete data/webdot/.htaccess and re-run checksetup.pl to rectify.\n";
if(-e "data/webdot/.htaccess") {
open HTACCESS, "data/webdot/.htaccess";
if(! grep(/png/,<HTACCESS>)) {
print "Dependency graph images are not accessible.\nDelete data/webdot/.htaccess and re-run checksetup.pl to rectify.\n";
}
close HTACCESS;
}
close HTACCESS;
}
return "";
}
......
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