oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Better error handling for importing packages.

Browse source
This commit is contained in:
Colin Kuskie 2009-07-09 16:37:51 +00:00
parent f428970c39
commit 3911846ce8
4 changed files with 33 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
docs/upgrades/_upgrade.skeleton
View file

@ -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'] );

11
docs/upgrades/upgrade_7.7.10-7.7.11.pl
View file

@ -127,7 +127,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'] );
@ -144,7 +151,7 @@ sub addPackage {
$asset->update( $properties );
}
return;
return 1;
}
#-------------------------------------------------

9
docs/upgrades/upgrade_7.7.11-7.7.12.pl
View file

@ -102,7 +102,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'] );

9
docs/upgrades/upgrade_7.7.12-7.7.13.pl
View file

@ -81,7 +81,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'] );