From 2053d3ef0806e3628683520ce4b4cbf23e8fd155 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Mon, 8 Mar 2010 16:35:46 -0800
Subject: [PATCH] Fix syntax errors, and remove duplicate code from the
 skeleton.

---
 docs/upgrades/_upgrade.skeleton        | 17 +----------------
 docs/upgrades/upgrade_7.7.33-7.8.13.pl |  2 +-
 docs/upgrades/upgrade_7.8.13-7.9.0.pl  |  2 +-
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/docs/upgrades/_upgrade.skeleton b/docs/upgrades/_upgrade.skeleton
index 93a33eb6d..a89ab3d63 100644
--- a/docs/upgrades/_upgrade.skeleton
+++ b/docs/upgrades/_upgrade.skeleton
@@ -61,7 +61,7 @@ sub addPackage {
     # Import the package into the import node
     my $package = eval {
         my $node = WebGUI::Asset->getImportNode($session);
-        my $node->importPackage( $storage, {
+        $node->importPackage( $storage, {
             overwriteLatest    => 1,
             clearPackageFlag   => 1,
             setDefaultTemplate => 1,
@@ -75,21 +75,6 @@ sub addPackage {
         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'] );
-    for my $assetId ( @{ $assetIds } ) {
-        my $asset   = WebGUI::Asset->newByDynamicClass( $session, $assetId );
-        if ( !$asset ) {
-            print "Couldn't instantiate asset with ID '$assetId'. Please check package '$file' for corruption.\n";
-            next;
-        }
-        my $properties = { isPackage => 0 };
-        if ($asset->isa('WebGUI::Asset::Template')) {
-            $properties->{isDefault} = 1;
-        }
-        $asset->update( $properties );
-    }
-
     return;
 }
 
diff --git a/docs/upgrades/upgrade_7.7.33-7.8.13.pl b/docs/upgrades/upgrade_7.7.33-7.8.13.pl
index d3689dd9a..42a6ab915 100644
--- a/docs/upgrades/upgrade_7.7.33-7.8.13.pl
+++ b/docs/upgrades/upgrade_7.7.33-7.8.13.pl
@@ -439,7 +439,7 @@ sub addPackage {
     # Import the package into the import node
     my $package = eval {
         my $node = WebGUI::Asset->getImportNode($session);
-        my $node->importPackage( $storage, {
+        $node->importPackage( $storage, {
             overwriteLatest    => 1,
             clearPackageFlag   => 1,
             setDefaultTemplate => 1,
diff --git a/docs/upgrades/upgrade_7.8.13-7.9.0.pl b/docs/upgrades/upgrade_7.8.13-7.9.0.pl
index 5e4d9ea95..84d14f51e 100644
--- a/docs/upgrades/upgrade_7.8.13-7.9.0.pl
+++ b/docs/upgrades/upgrade_7.8.13-7.9.0.pl
@@ -173,7 +173,7 @@ sub addPackage {
     # Import the package into the import node
     my $package = eval {
         my $node = WebGUI::Asset->getImportNode($session);
-        my $node->importPackage( $storage, {
+        $node->importPackage( $storage, {
             overwriteLatest    => 1,
             clearPackageFlag   => 1,
             setDefaultTemplate => 1,