[LON-CAPA-cvs] cvs: loncom /build/system_dependencies sqltest.pl
harris41
lon-capa-cvs@mail.lon-capa.org
Thu, 12 Sep 2002 22:47:28 -0000
harris41 Thu Sep 12 18:47:28 2002 EDT
Modified files:
/loncom/build/system_dependencies sqltest.pl
Log:
removing support for scanning access.conf
Index: loncom/build/system_dependencies/sqltest.pl
diff -u loncom/build/system_dependencies/sqltest.pl:1.8 loncom/build/system_dependencies/sqltest.pl:1.9
--- loncom/build/system_dependencies/sqltest.pl:1.8 Wed Aug 7 14:43:42 2002
+++ loncom/build/system_dependencies/sqltest.pl Thu Sep 12 18:47:28 2002
@@ -2,7 +2,7 @@
# sqltest.pl - script to test MySQL database connectivity for LON-CAPA
#
-# $Id: sqltest.pl,v 1.8 2002/08/07 18:43:42 harris41 Exp $
+# $Id: sqltest.pl,v 1.9 2002/09/12 22:47:28 harris41 Exp $
#
###
@@ -135,7 +135,7 @@
=cut
# =================================== Process version information of this file.
-my $VERSION = sprintf("%d.%02d", q$Revision: 1.8 $ =~ /(\d+)\.(\d+)/);
+my $VERSION = sprintf("%d.%02d", q$Revision: 1.9 $ =~ /(\d+)\.(\d+)/);
print('Running sqltest.pl, version '.$VERSION.'.'."\n");
print('(Test interoperability of the MySQL server for use by LON-CAPA.)'."\n");
@@ -153,9 +153,6 @@
my $webconfdir='/etc/httpd/conf/';
-# NOTE: DEPRECATED scanning of access.conf
-&configuration_scan(\%perlvar,$webconfdir.'access.conf');
-
# Scanning the standard loncapa configuration files.
&configuration_scan(\%perlvar,$webconfdir.'loncapa.conf');
&configuration_scan(\%perlvar,$webconfdir.'loncapa_apache.conf');
@@ -302,9 +299,7 @@
# --------- configuration_scan: look for PerlSetVar and store in hash variable.
sub configuration_scan {
my ($storagehashref,$filename)=@_;
- # deprecated support for access.conf
open(CONFIG,$filename) or
- ($filename=~/access\.conf$/ and return) or
(print("Can't read $filename\n") && exit(1));
while (my $configline=<CONFIG>) {
if ($configline =~ /^[^\#]*PerlSetVar/) {