[interchange-cvs] interchange - heins modified lib/Vend/Config.pm

[interchange-core@interchange.redhat.com]

User:      heins
Date:      2002-02-04 04:36:45 GMT
Modified:  lib/Vend Config.pm
Log:
	* Make the default to include all tags, as anything else will break
	  catalogs. If people want to avoid this, they can call out one of
	  the standard tag groups.

Revision  Changes    Path
2.35      +10 -4     interchange/lib/Vend/Config.pm


rev 2.35, prev_rev 2.34
Index: Config.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Config.pm,v
retrieving revision 2.34
retrieving revision 2.35
diff -u -r2.34 -r2.35
--- Config.pm	3 Feb 2002 23:11:57 -0000	2.34
+++ Config.pm	4 Feb 2002 04:36:45 -0000	2.35
@@ -1,6 +1,6 @@
 # Vend::Config - Configure Interchange
 #
-# $Id: Config.pm,v 2.34 2002/02/03 23:11:57 mheins Exp $
+# $Id: Config.pm,v 2.35 2002/02/04 04:36:45 mheins Exp $
 #
 # Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -44,7 +44,7 @@
 use Vend::Parse;
 use Vend::Util;
 
-$VERSION = substr(q$Revision: 2.34 $, 10);
+$VERSION = substr(q$Revision: 2.35 $, 10);
 
 my %CDname;
 
@@ -265,7 +265,7 @@
 	['HouseKeeping',     'integer',          60],
 	['Mall',	          'yesno',           'No'],
 	['TagGroup',		 'tag_group',		 $StdTags],
-	['TagInclude',		 'tag_include',		 ':core'],
+	['TagInclude',		 'tag_include',		 'ALL'],
 	['ActionMap',		 'action',			 ''],
 	['FormAction',		 'action',			 ''],
 	['MaxServers',       'integer',          10],
@@ -1494,6 +1494,12 @@
 	$setting =~ s/\s+$//;
 	$setting =~ s/[,\s]+/ /g;
 
+	if($setting eq 'ALL') {
+		return { ALL => 1 };
+	}
+
+	delete $c->{ALL};
+
 	my @incs = Text::ParseWords::shellwords($setting);
 
 	for(@incs) {
@@ -3252,7 +3258,7 @@
 	}
 
 	if($CodeDest and $CodeDest eq 'CoreTag') {
-		return $c unless $Global::TagInclude->{$tag};
+		return $c unless $Global::TagInclude->{$tag} || $Global::TagInclude->{ALL};
 	}
 
 	if($p eq 'Routine' or $p eq 'PosRoutine') {