summaryrefslogtreecommitdiffstats
path: root/defparams.pl
diff options
context:
space:
mode:
authorgerv%gerv.net <>2002-04-03 04:23:23 +0200
committergerv%gerv.net <>2002-04-03 04:23:23 +0200
commit9e455ff8ab5f0e7e2560b91bf5d7b619dbc971cc (patch)
treeda6453c8a91564712406e27937ef04e6519a0044 /defparams.pl
parent9f62c083ad60db626d50d1480ffac02ff80065d0 (diff)
downloadbugzilla-9e455ff8ab5f0e7e2560b91bf5d7b619dbc971cc.tar.gz
bugzilla-9e455ff8ab5f0e7e2560b91bf5d7b619dbc971cc.tar.xz
Bug 120537 (b) - fix previous patch to not complain if there's no .htaccess file. Patch by ddkilzer@theracingworld.com; r=justdave, bbaetz.
Diffstat (limited to 'defparams.pl')
-rw-r--r--defparams.pl10
1 files changed, 6 insertions, 4 deletions
diff --git a/defparams.pl b/defparams.pl
index f5b7ba098..eddf50942 100644
--- a/defparams.pl
+++ b/defparams.pl
@@ -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 "";
}