[interchange-cvs] interchange - jon modified 4 files
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Mon Jan 30 12:44:11 EST 2006
User: jon
Date: 2006-01-30 17:44:11 GMT
Modified: debian interchange.cfg
Modified: dist interchange.cfg.dist
Modified: dist/standard catalog.cfg
Modified: lib/Vend Config.pm
Log:
Remove global and catalog directives "ConfigParseComments". Its "no"
behavior is now the only one. That means that #ifdef, #include, and friends
are now never anything besides comments.
To be noted in UPGRADE document.
Revision Changes Path
2.15 +0 -10 interchange/debian/interchange.cfg
rev 2.15, prev_rev 2.14
Index: interchange.cfg
===================================================================
RCS file: /var/cvs/interchange/debian/interchange.cfg,v
retrieving revision 2.14
retrieving revision 2.15
diff -u -u -r2.14 -r2.15
--- interchange.cfg 4 Oct 2005 20:46:54 -0000 2.14
+++ interchange.cfg 30 Jan 2006 17:44:10 -0000 2.15
@@ -30,16 +30,6 @@
#========================================================================#
-# This is a new option that ignores C-style directives like #ifdef,
-# #endif, #include, and only parses plain ifdef, endif, include, etc.
-# It can be turned on and off repeatedly as needed. When it's off,
-# you can now be confident that a line starting with a # is a comment.
-# This directive affects the entire global configuration, so check any
-# files you include if you're upgrading.
-# ConfigParseComments No
-
-#========================================================================#
-
# Whether to consider the whole URL for determining the catalog or not
ifdef @FULL_URL
2.8 +0 -3 interchange/dist/interchange.cfg.dist
rev 2.8, prev_rev 2.7
Index: interchange.cfg.dist
===================================================================
RCS file: /var/cvs/interchange/dist/interchange.cfg.dist,v
retrieving revision 2.7
retrieving revision 2.8
diff -u -u -r2.7 -r2.8
--- interchange.cfg.dist 11 Nov 2005 20:52:04 -0000 2.7
+++ interchange.cfg.dist 30 Jan 2006 17:44:10 -0000 2.8
@@ -34,9 +34,6 @@
#========================================================================#
-# Disable old C-style meta-directives like #ifdef, #endif, and #include.
-ConfigParseComments No
-
Environment MOD_PERL
# Prevent arbitrary [file ...] and [include ...] among other things.
1.12 +0 -4 interchange/dist/standard/catalog.cfg
rev 1.12, prev_rev 1.11
Index: catalog.cfg
===================================================================
RCS file: /var/cvs/interchange/dist/standard/catalog.cfg,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -u -r1.11 -r1.12
--- catalog.cfg 19 Oct 2005 14:26:32 -0000 1.11
+++ catalog.cfg 30 Jan 2006 17:44:10 -0000 1.12
@@ -5,10 +5,6 @@
#==========================================================================#
-# Ignore older C-style directives like #ifdef, #endif, #include.
-# This directive affects the entire catalog configuration.
-ConfigParseComments No
-
# Read in some initial default variables from a directory. These are
# larger ones -- they could conceivably be maintained in the
# VariableDatabase but might be easier to maintain in a file, especially
2.192 +9 -15 interchange/lib/Vend/Config.pm
rev 2.192, prev_rev 2.191
Index: Config.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Config.pm,v
retrieving revision 2.191
retrieving revision 2.192
diff -u -u -r2.191 -r2.192
--- Config.pm 13 Dec 2005 14:39:08 -0000 2.191
+++ Config.pm 30 Jan 2006 17:44:10 -0000 2.192
@@ -1,6 +1,6 @@
# Vend::Config - Configure Interchange
#
-# $Id: Config.pm,v 2.191 2005/12/13 14:39:08 mheins Exp $
+# $Id: Config.pm,v 2.192 2006/01/30 17:44:10 jon Exp $
#
# Copyright (C) 2002-2005 Interchange Development Group
# Copyright (C) 1996-2002 Red Hat, Inc.
@@ -54,7 +54,7 @@
use Vend::Data;
use Vend::Cron;
-$VERSION = substr(q$Revision: 2.191 $, 10);
+$VERSION = substr(q$Revision: 2.192 $, 10);
my %CDname;
my %CPname;
@@ -385,7 +385,6 @@
['ConfigDir', undef, 'etc/lib'],
['FeatureDir', 'root_dir', 'features'],
['ConfigDatabase', 'config_db', ''],
- ['ConfigParseComments', 'yesno', 'Yes'],
['ConfigAllBefore', 'array', "$Global::VendRoot/catalog_before.cfg"],
['ConfigAllAfter', 'array', "$Global::VendRoot/catalog_after.cfg"],
['Message', 'message', ''],
@@ -530,7 +529,6 @@
['ConfigDir', 'relative_dir', 'config'],
['TemplateDir', 'dir_array', ''],
['ConfigDatabase', 'config_db', ''],
- ['ConfigParseComments', 'yesno', 'Yes'],
['Require', 'require', ''],
['Suggest', 'suggest', ''],
['Message', 'message', ''],
@@ -1171,20 +1169,18 @@
#print "seeking to $tellmark in $configfile, include is @include\n";
my ($ifdef, $begin_ifdef);
while(<CONFIG>) {
- # Look for meta commands (ifdef, endif, include) after '#'?
- my $leadinghash = $C->{ConfigParseComments} ? '#?' : '';
if($allcfg) {
print ALLCFG $_
- unless /^${leadinghash}include\s+/i;
+ unless /^\s*include\s+/i;
}
chomp; # zap trailing newline,
- if(/^\s*${leadinghash}endif\s*$/i) {
+ if(/^\s*endif\s*$/i) {
#print "found $_\n";
undef $ifdef;
undef $begin_ifdef;
next;
}
- if(/^\s*${leadinghash}if(n?)def\s+(.*)/i) {
+ if(/^\s*if(n?)def\s+(.*)/i) {
if(defined $ifdef) {
config_error("Can't overlap ifdef at line %s of %s", $., $configfile);
}
@@ -1196,7 +1192,7 @@
if(defined $ifdef) {
next unless $ifdef;
}
- if(/^\s*${leadinghash}include\s+(.+)/i) {
+ if(/^\s*include\s+(.+)/i) {
#print "found $_\n";
my $spec = $1;
$spec = substitute_variable($spec) if $C->{ParseVariables};
@@ -1874,15 +1870,13 @@
#print "seeking to $tellmark in $configfile, include is @include\n";
my ($ifdef, $begin_ifdef);
while(<GLOBAL>) {
- # Look for meta commands (ifdef, endif, include) after '#'?
- my $leadinghash = $Global::ConfigParseComments ? '#?' : '';
- if(/^\s*${leadinghash}endif\s*$/i) {
+ if(/^\s*endif\s*$/i) {
#print "found $_";
undef $ifdef;
undef $begin_ifdef;
next;
}
- if(/^\s*${leadinghash}if(n?)def\s+(.*)/i) {
+ if(/^\s*if(n?)def\s+(.*)/i) {
#print "found $_";
if(defined $ifdef) {
config_error(
@@ -1898,7 +1892,7 @@
if(defined $ifdef) {
next unless $ifdef;
}
- if(/^\s*${leadinghash}include\s+(.+)/) {
+ if(/^\s*include\s+(.+)/) {
#print "found $_";
my $spec = $1;
my $ref = [ $configfile, tell(GLOBAL)];
More information about the interchange-cvs
mailing list