[interchange-cvs] interchange - heins modified lib/Vend/Config.pm
interchange-core@icdevgroup.org
interchange-core@icdevgroup.org
Wed Dec 11 22:17:00 2002
User: heins
Date: 2002-12-12 03:16:42 GMT
Modified: lib/Vend Config.pm
Log:
* Tolerate missing configdb database, issue warning only.
Revision Changes Path
2.85 +10 -4 interchange/lib/Vend/Config.pm
rev 2.85, prev_rev 2.84
Index: Config.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Config.pm,v
retrieving revision 2.84
retrieving revision 2.85
diff -u -r2.84 -r2.85
--- Config.pm 10 Dec 2002 20:08:56 -0000 2.84
+++ Config.pm 12 Dec 2002 03:16:42 -0000 2.85
@@ -1,6 +1,6 @@
# Vend::Config - Configure Interchange
#
-# $Id: Config.pm,v 2.84 2002/12/10 20:08:56 jon Exp $
+# $Id: Config.pm,v 2.85 2002/12/12 03:16:42 mheins Exp $
#
# Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
#
@@ -45,7 +45,7 @@
use Vend::Util;
use Vend::Data;
-$VERSION = substr(q$Revision: 2.84 $, 10);
+$VERSION = substr(q$Revision: 2.85 $, 10);
my %CDname;
@@ -3141,7 +3141,10 @@
my ($file, $type);
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;
@@ -3224,7 +3227,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;