[interchange-cvs] interchange - kwalsh modified 2 files

[interchange-core@interchange.redhat.com]

User:      kwalsh
Date:      2002-02-04 07:41:39 GMT
Modified:  scripts  expire.PL expireall.PL
Log:
Set $Vend::ControllingInterchange = 1 before calling global_config()
so that the core tags don't get compiled unnecessarily.

It doesn't save a lot of time, but every little helps.

Revision  Changes    Path
2.2       +8 -2      interchange/scripts/expire.PL


rev 2.2, prev_rev 2.1
Index: expire.PL
===================================================================
RCS file: /var/cvs/interchange/scripts/expire.PL,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -r2.1 -r2.2
--- expire.PL	16 Jan 2002 18:57:52 -0000	2.1
+++ expire.PL	4 Feb 2002 07:41:39 -0000	2.2
@@ -50,7 +50,7 @@
 #
 # Interchange session expiration
 #
-# $Id: expire.PL,v 2.1 2002/01/16 18:57:52 jon Exp $
+# $Id: expire.PL,v 2.2 2002/02/04 07:41:39 kwalsh Exp $
 #
 # Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -224,8 +224,14 @@
 
 if(defined $catalog) {
 	my($name,$dir,$param);
-	chdir $Global::VendRoot;
+
+	# Parse the interchange.cfg file to look for script/catalog info
+	# but don't read in the core tags
+	$Vend::ControllingInterchange = 1;
+	chdir $Global::VendRoot
+		or die "Couldn't change to $Global::VendRoot: $!\n";
 	global_config();
+
 	$g = $Global::Catalog{$catalog};
 	chdir $g->{dir} or die "chdir to $g->{dir}: $!\n";
 	$Vend::Cfg = Vend::Config::config(



2.2       +4 -2      interchange/scripts/expireall.PL


rev 2.2, prev_rev 2.1
Index: expireall.PL
===================================================================
RCS file: /var/cvs/interchange/scripts/expireall.PL,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -r2.1 -r2.2
--- expireall.PL	3 Feb 2002 01:31:56 -0000	2.1
+++ expireall.PL	4 Feb 2002 07:41:39 -0000	2.2
@@ -50,7 +50,7 @@
 #
 # Interchange session expiration for all catalogs
 #
-# $Id: expireall.PL,v 2.1 2002/02/03 01:31:56 kwalsh Exp $
+# $Id: expireall.PL,v 2.2 2002/02/04 07:41:39 kwalsh Exp $
 #
 # Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -155,6 +155,8 @@
 }
 
 # Parse the interchange.cfg file to look for script/catalog info
+# but don't read in the core tags
+$Vend::ControllingInterchange = 1;
 chdir $Global::VendRoot or die "Couldn't change to $Global::VendRoot: $!\n";
 global_config();
 
@@ -173,7 +175,7 @@
 
 =head1 VERSION
 
-# $Id: expireall.PL,v 2.1 2002/02/03 01:31:56 kwalsh Exp $
+# $Id: expireall.PL,v 2.2 2002/02/04 07:41:39 kwalsh Exp $
 
 =head1 DESCRIPTION