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

interchange-core@icdevgroup.org interchange-core@icdevgroup.org
Tue Jan 21 20:40:01 2003


User:      racke
Date:      2003-01-22 01:39:16 GMT
Modified:  lib/Vend Tag: STABLE_4_8-branch Data.pm
Log:
merged changes 2.20 vs 2.21
+++ 2.21 +++
this should fix a longstanding bug where Interchange get stuck into
an infinite loop on startup in case of wrong SQL database access
information, which occurs on the second table maybe due to the
bad setting in DBI, please test this change

Revision  Changes    Path
No                   revision



No                   revision



2.0.2.7   +2 -2      interchange/lib/Vend/Data.pm


rev 2.0.2.7, prev_rev 2.0.2.6
Index: Data.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Data.pm,v
retrieving revision 2.0.2.6
retrieving revision 2.0.2.7
diff -u -r2.0.2.6 -r2.0.2.7
--- Data.pm	26 Nov 2002 03:21:10 -0000	2.0.2.6
+++ Data.pm	22 Jan 2003 01:39:16 -0000	2.0.2.7
@@ -1,6 +1,6 @@
 # Vend::Data - Interchange databases
 #
-# $Id: Data.pm,v 2.0.2.6 2002/11/26 03:21:10 jon Exp $
+# $Id: Data.pm,v 2.0.2.7 2003/01/22 01:39:16 racke Exp $
 # 
 # Copyright (C) 1996-2002 Red Hat, Inc. and
 # Interchange Development Group, http://www.icdevgroup.org/
@@ -919,7 +919,7 @@
 		if($@) {
 #::logDebug("Dieing of $@");
 			die $@ unless $no_import;
-			die $@ unless $tried_import++;
+			die $@ if $tried_import++;
 			if(! -f $database_dbm) {
 				$Vend::ForceImport{$obj->{name}} = 1;
 				return import_database($obj);