===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 3.26
retrieving revision 3.27
diff -u -p -r3.26 -r3.27
--- cvsweb/cvsweb.cgi 2000/09/22 11:13:17 3.26
+++ cvsweb/cvsweb.cgi 2000/09/28 18:06:58 3.27
@@ -43,7 +43,7 @@
# SUCH DAMAGE.
#
# $zId: cvsweb.cgi,v 1.103 2000/09/20 17:02:29 jumager Exp $
-# $Id: cvsweb.cgi,v 3.26 2000/09/22 11:13:17 knu Exp $
+# $Id: cvsweb.cgi,v 3.27 2000/09/28 18:06:58 knu Exp $
#
###
@@ -224,9 +224,11 @@ $maycompress = (((defined($ENV{HTTP_ACCEPT_ENCODING})
@stickyvars = qw(cvsroot hideattic sortby logsort f only_with_tag);
if (-f $config) {
- do $config;
-}
-else {
+ do $config
+ || &fatal("500 Internal Error",
+ sprintf('Error in loading configuration file: %s
%s
',
+ $config, &htmlify($@)));
+} else {
&fatal("500 Internal Error",
'Configuration not found. Set the variable $config '
. 'in cvsweb.cgi, or the environment variable '
@@ -355,8 +357,15 @@ foreach my $k (keys %ICONS) {
}
}
+my $config_cvstree = "$config-$cvstree";
+
# Do some special configuration for cvstrees
-do "$config-$cvstree" if (-f "$config-$cvstree");
+if (-f $config_cvstree) {
+ do $config_cvstree
+ || &fatal("500 Internal Error",
+ sprintf('Error in loading configuration file: %s
%s
',
+ $config_cvstree, &htmlify($@)));
+}
$prcategories = '(?:' . join('|', @prcategories) . ')';
$prcgi .= '%s' if defined($prcgi) && $prcgi !~ /%s/;
@@ -2470,7 +2479,7 @@ sub navigateHeader($$$$$) {
$swhere = urlencode($filename) if ($swhere eq "");
print "<\!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">";
print "\n\n";
- print '';
+ print '';
print "\n$path$filename - $title - $rev\n";
print "$body_tag_for_src\n";
print "";
@@ -2825,7 +2834,7 @@ sub http_header(;$) {
sub html_header($) {
my ($title) = @_;
- my $version = '$zRevision: 1.103 $ $Revision: 3.26 $'; #'
+ my $version = '$zRevision: 1.103 $ $Revision: 3.27 $'; #'
http_header();
print <