Commit 7bda1fe6 authored by zach%zachlipton.com's avatar zach%zachlipton.com

Fix for bug 97290: checksetup.pl should report about errors in localconfig

r=kiko x2
parent 2e428770
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
# Terry Weissman <terry@mozilla.org> # Terry Weissman <terry@mozilla.org>
# Dan Mosedale <dmose@mozilla.org> # Dan Mosedale <dmose@mozilla.org>
# Dave Miller <justdave@syndicomm.com> # Dave Miller <justdave@syndicomm.com>
# Zach Lipton <zach@zachlipton.com>
# #
# #
# Direct any questions on this source code to # Direct any questions on this source code to
...@@ -265,6 +266,24 @@ if (@missing > 0) { ...@@ -265,6 +266,24 @@ if (@missing > 0) {
print "Checking user setup ...\n"; print "Checking user setup ...\n";
do 'localconfig'; do 'localconfig';
if ($@ ne "") { # capture errors in localconfig, bug 97290
print STDERR <<EOT;
An error has occurred while reading your
'localconfig' file. The text of the error message is:
$@
Please fix the error in your 'localconfig' file.
Alternately rename your 'localconfig' file, rerun
checksetup.pl, and re-enter your answers.
$ mv -f localconfig localconfig.old
$ ./checksetup.pl
EOT
die "Syntax error in localconfig";
}
my $newstuff = ""; my $newstuff = "";
sub LocalVar ($$) sub LocalVar ($$)
{ {
......
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