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

[interchange-core@icdevgroup.org]

User:      jon
Date:      2003-01-24 03:31:17 GMT
Modified:  lib/Vend Tag: STABLE_4_8-branch Config.pm
Log:
Merge from trunk:

* Tolerate missing configdb database, issue warning only.

Revision  Changes    Path
No                   revision



No                   revision



2.2.2.14  +10 -4     interchange/lib/Vend/Config.pm


rev 2.2.2.14, prev_rev 2.2.2.13
Index: Config.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Config.pm,v
retrieving revision 2.2.2.13
retrieving revision 2.2.2.14
diff -u -u -r2.2.2.13 -r2.2.2.14
--- Config.pm	26 Nov 2002 03:21:09 -0000	2.2.2.13
+++ Config.pm	24 Jan 2003 03:31:17 -0000	2.2.2.14
@@ -1,6 +1,6 @@
 # Vend::Config - Configure Interchange
 #
-# $Id: Config.pm,v 2.2.2.13 2002/11/26 03:21:09 jon Exp $
+# $Id: Config.pm,v 2.2.2.14 2003/01/24 03:31:17 jon Exp $
 #
 # Copyright (C) 1996-2002 Red Hat, Inc. and
 # Interchange Development Group, http://www.icdevgroup.org/
@@ -96,7 +96,7 @@
 use Vend::Parse;
 use Vend::Util;
 
-$VERSION = substr(q$Revision: 2.2.2.13 $, 10);
+$VERSION = substr(q$Revision: 2.2.2.14 $, 10);
 
 my %CDname;
 
@@ -2695,7 +2695,10 @@
 	return '' if ! $value;
 	local($Vend::Cfg) = $C;
 
-	my ($db, $table) = get_configdb($var, $value);
+	my ($db, $table);
+	eval {
+		($db, $table) = get_configdb($var, $value);
+	}
 
 	return '' if ! $db;
 
@@ -2758,7 +2761,10 @@
 	return '' if ! $value;
 	local($Vend::Cfg) = $C;
 
-	my ($db, $table) = get_configdb($var, $value);
+	my ($db, $table);
+	eval {
+		($db, $table) = get_configdb($var, $value);
+	}
 
 	return '' if ! $db;