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

[interchange-core@interchange.redhat.com]

User:      jon
Date:      2002-01-24 06:41:11 GMT
Modified:  lib/Vend Config.pm
Log:
Give better error message when a required catalog directive is missing.
Use main file (usually catalog.cfg) instead of empty string or
catalog_after.cfg (etc.) as example of where directive should go.

Fixes bug #337. Thanks to Jeff Murphy (jeffmurphy.org) for reporting.

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


rev 2.23, prev_rev 2.22
Index: Config.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Config.pm,v
retrieving revision 2.22
retrieving revision 2.23
diff -u -u -r2.22 -r2.23
--- Config.pm	22 Jan 2002 02:20:00 -0000	2.22
+++ Config.pm	24 Jan 2002 06:41:11 -0000	2.23
@@ -1,6 +1,6 @@
 # Vend::Config - Configure Interchange
 #
-# $Id: Config.pm,v 2.22 2002/01/22 02:20:00 mheins Exp $
+# $Id: Config.pm,v 2.23 2002/01/24 06:41:11 jon Exp $
 #
 # Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -95,7 +95,7 @@
 use Vend::Parse;
 use Vend::Util;
 
-$VERSION = substr(q$Revision: 2.22 $, 10);
+$VERSION = substr(q$Revision: 2.23 $, 10);
 
 my %CDname;
 
@@ -687,7 +687,7 @@
 		}
 	}
 
-	my(@include) = ($passed_file || $C->{ConfigFile});
+	my(@include) = my $catalogcfg = ($passed_file || $C->{ConfigFile});
 	my $done_one;
 	my ($db, $dname, $nm);
 	my ($before, $after);
@@ -1014,7 +1014,7 @@
 				my $msg = errmsg(
 					"Please specify the %s directive in the configuration file '%s'",
 					$CDname{$var},
-					$configfile,
+					$catalogcfg,
 				);
 
 				die "$msg\n";