From 26ddd1bfaa0bbc25f62bd6bcc0250b051482dfc6 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 12 Aug 2013 21:11:18 +0000
Subject: [PATCH] Better error handling when upgrading

---
 importexport/setup/tables_update.inc.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/importexport/setup/tables_update.inc.php b/importexport/setup/tables_update.inc.php
index a9b935a13b..e58cbd762b 100755
--- a/importexport/setup/tables_update.inc.php
+++ b/importexport/setup/tables_update.inc.php
@@ -84,10 +84,18 @@ function importexport_upgrade1_9_002()
 			// step through each file in defdir of app
 			$d = dir($defdir);
 			while (false !== ($entry = $d->read())) {
-				$file = $defdir. '/'. $entry;
-				list( $filename, $extension) = explode('.',$entry);
-				if ( $extension != 'xml' ) continue;
-				importexport_definitions_bo::import( $file );
+				try
+				{
+					$file = $defdir. '/'. $entry;
+					list( $filename, $extension) = explode('.',$entry);
+					if ( $extension != 'xml' ) continue;
+					importexport_definitions_bo::import( $file );
+				}
+				catch (Exception $e)
+				{
+					error_log($e->getMessage());
+					error_log("Unable to import definition file $file, skipping it.");
+				}
 			}
 		}
 	}