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

[interchange-cvs at icdevgroup.org]

User:      racke
Date:      2008-02-14 16:29:49 GMT
Modified:  lib/Vend Config.pm
Log:
config_error can be called after we left the context of a configuration file
(e.g. from set_defaults), resulting in warped error messages like the following:

demo config error: Directive Locale returned default setting error: Default locale de_DEx missing
In line 0 of the configuration file '':

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


rev 2.232, prev_rev 2.231
Index: Config.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Config.pm,v
retrieving revision 2.231
retrieving revision 2.232
diff -u -r2.231 -r2.232
--- Config.pm	14 Feb 2008 16:11:39 -0000	2.231
+++ Config.pm	14 Feb 2008 16:29:48 -0000	2.232
@@ -1,6 +1,6 @@
 # Vend::Config - Configure Interchange
 #
-# $Id: Config.pm,v 2.231 2008/02/14 16:11:39 racke Exp $
+# $Id: Config.pm,v 2.232 2008/02/14 16:29:48 racke Exp $
 #
 # Copyright (C) 2002-2008 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.231 $, 10);
+$VERSION = substr(q$Revision: 2.232 $, 10);
 
 my %CDname;
 my %CPname;
@@ -337,12 +337,15 @@
 	}
 
 	local($^W);
-	$msg = errmsg("%s\nIn line %s of the configuration file '%s':\n%s\n",
+	if ($configfile) {
+		$msg = errmsg("%s\nIn line %s of the configuration file '%s':\n%s\n",
 			$msg,
 			$.,
 			$configfile,
 			$Vend::config_line,
-	);
+		);
+	}
+	
 	if ($Vend::ExternalProgram) {
 		warn "$msg\n" unless $Vend::Quiet;
 	}