From 80b5c57155d85ae592f1fbbc2be5e891c0e8a0a8 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Thu, 9 Jul 2009 16:48:24 +0000
Subject: [PATCH] Another upgraded upgrade script.

---
 docs/upgrades/upgrade_7.7.13-7.7.14.pl | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/upgrades/upgrade_7.7.13-7.7.14.pl b/docs/upgrades/upgrade_7.7.13-7.7.14.pl
index 21f5f1a0f..a0eaf8635 100644
--- a/docs/upgrades/upgrade_7.7.13-7.7.14.pl
+++ b/docs/upgrades/upgrade_7.7.13-7.7.14.pl
@@ -58,7 +58,14 @@ sub addPackage {
     $storage->addFileFromFilesystem( $file );
 
     # Import the package into the import node
-    my $package = WebGUI::Asset->getImportNode($session)->importPackage( $storage );
+    my $package = eval { WebGUI::Asset->getImportNode($session)->importPackage( $storage ); };
+
+    if ($package eq 'corrupt') {
+        die "Corrupt package found in $file.  Stopping upgrade.\n";
+    }
+    if ($@ || !defined $package) {
+        die "Error during package import on $file: $@\nStopping upgrade\n.";
+    }
 
     # Turn off the package flag, and set the default flag for templates added
     my $assetIds = $package->getLineage( ['self','descendants'] );