[interchange-cvs] interchange - jon modified 2 files

interchange-core@interchange.redhat.com interchange-core@interchange.redhat.com
Tue Nov 27 12:07:01 2001


User:      jon
Date:      2001-11-27 17:01:24 GMT
Modified:  dist/foundation catalog.cfg
Modified:  dist/lib/UI/pages/admin dbconfig.html
Log:
Make 'ConfigParseComments No' the default for catalog configuration, as
it has been for global configuration since 4.7. (4.9+ only.)

Revision  Changes    Path
2.5       +4 -0      interchange/dist/foundation/catalog.cfg


rev 2.5, prev_rev 2.4
Index: catalog.cfg
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/catalog.cfg,v
retrieving revision 2.4
retrieving revision 2.5
diff -u -u -r2.4 -r2.5
--- catalog.cfg	2001/10/13 23:27:49	2.4
+++ catalog.cfg	2001/11/27 17:01:23	2.5
@@ -5,6 +5,10 @@
 
 #==========================================================================#
 
+# Ignore older C-style directives like #ifdef, #endif, #include.
+# This directive affects the entire catalog configuration.
+ConfigParseComments No
+
 # Read in initial variables from a database.
 VariableDatabase variable
 



2.1       +2 -2      interchange/dist/lib/UI/pages/admin/dbconfig.html


rev 2.1, prev_rev 2.0
Index: dbconfig.html
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/pages/admin/dbconfig.html,v
retrieving revision 2.0
retrieving revision 2.1
diff -u -u -r2.0 -r2.1
--- dbconfig.html	2001/07/18 02:22:00	2.0
+++ dbconfig.html	2001/11/27 17:01:24	2.1
@@ -167,11 +167,11 @@
 	}
 
 	if($Dref->{USER_default}) {
-		$string .= "#ifdef SQLPASS\n";
+		$string .= "ifdef SQLPASS\n";
 		for (qw/USER PASS/) {
 			$string .= tout($_,  "__SQL" . $_ . "__");
 		}
-		$string .= "#endif\n";
+		$string .= "endif\n";
 	}
 	else {
 		for (qw/USER PASS/) {