Fix installing the merged package from 7.7.33 to 7.8.13. Fixes bug #1…

…1442.
plainblack · Feb 26, 2010 · 1ef1633 · 1ef1633
1 parent 8076522
commit 1ef1633
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 12 deletions.
diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
@@ -1,5 +1,5 @@
 7.8.14
-
+ - fixed #11442: PickLanguage template missing after 7.7 to 7.8 upgrade
 
 7.8.13
  - fixed #11418: confusing typ-o in gotcha

diff --git a/docs/upgrades/upgrade_7.7.33-7.8.13.pl b/docs/upgrades/upgrade_7.7.33-7.8.13.pl
@@ -493,18 +493,8 @@ sub finish {
 #-------------------------------------------------
 sub updateTemplates {
     my $session = shift;
-    return undef unless (-d "packages-".$toVersion);
     print "\tUpdating packages.\n" unless ($quiet);
-    opendir(DIR,"packages-".$toVersion);
-    my @files = readdir(DIR);
-    closedir(DIR);
-    my $newFolder = undef;
-    foreach my $file (@files) {
-        next unless ($file =~ /\.wgpkg$/);
-        # Fix the filename to include a path
-        $file       = "packages-" . $toVersion . "/" . $file;
-        addPackage( $session, $file );
-    }
+    addPackage( $session, 'packages-7.7.33-7.8.13/merged.wgpkg' );
 }
 
 #vim:ft=perl
diff --git a/docs/upgrades/upgrade_7.8.13-7.8.14.pl b/docs/upgrades/upgrade_7.8.13-7.8.14.pl
@@ -44,6 +44,66 @@ BEGIN
 #    print "DONE!\n" unless $quiet;
 #}
 
+sub upgradeToYUI28 {
+    my $session = shift;
+    print "\tUpgrading to YUI 2.8... " unless $quiet;
+
+    $session->db->write(
+        "UPDATE template SET template = REPLACE(template, 'element-beta.js', 'element-min.js')"
+    );
+    $session->db->write(
+        "UPDATE template SET template = REPLACE(template, 'element-beta-min.js', 'element-min.js')"
+    );
+    $session->db->write(
+        "UPDATE template SET templatePacked = REPLACE(templatePacked, 'element-beta.js', 'element-min.js')"
+    );
+    $session->db->write(
+        "UPDATE template SET templatePacked = REPLACE(templatePacked, 'element-beta-min.js', 'element-min.js')"
+    );
+
+    $session->db->write(
+        "UPDATE assetData SET extraHeadTags = REPLACE(extraHeadTags, 'element-beta.js', 'element-min.js')"
+    );
+    $session->db->write(
+        "UPDATE assetData SET extraHeadTags = REPLACE(extraHeadTags, 'element-beta-min.js', 'element-min.js')"
+    );
+    $session->db->write(
+        "UPDATE assetData SET extraHeadTagsPacked = REPLACE(extraHeadTagsPacked, 'element-beta.js', 'element-min.js')"
+    );
+    $session->db->write(
+        "UPDATE assetData SET extraHeadTagsPacked = REPLACE(extraHeadTagsPacked, 'element-beta-min.js', 'element-min.js')"
+    );
+
+    $session->db->write(
+        "UPDATE template SET template = REPLACE(template, 'carousel-beta.js', 'carousel-min.js')"
+    );
+    $session->db->write(
+        "UPDATE template SET template = REPLACE(template, 'carousel-beta-min.js', 'carousel-min.js')"
+    );
+    $session->db->write(
+        "UPDATE template SET templatePacked = REPLACE(templatePacked, 'carousel-beta.js', 'carousel-min.js')"
+    );
+    $session->db->write(
+        "UPDATE template SET templatePacked = REPLACE(templatePacked, 'carousel-beta-min.js', 'carousel-min.js')"
+    );
+
+    $session->db->write(
+        "UPDATE assetData SET extraHeadTags = REPLACE(extraHeadTags, 'carousel-beta.js', 'carousel-min.js')"
+    );
+    $session->db->write(
+        "UPDATE assetData SET extraHeadTags = REPLACE(extraHeadTags, 'carousel-beta-min.js', 'carousel-min.js')"
+    );
+    $session->db->write(
+        "UPDATE assetData SET extraHeadTagsPacked = REPLACE(extraHeadTagsPacked, 'carousel-beta.js', 'carousel-min.js')"
+    );
+    $session->db->write(
+        "UPDATE assetData SET extraHeadTagsPacked = REPLACE(extraHeadTagsPacked, 'carousel-beta-min.js', 'carousel-min.js')"
+    );
+
+    print "Done.\n" unless $quiet;
+}
+
+
 
 # -------------- DO NOT EDIT BELOW THIS LINE --------------------------------
 
@@ -104,6 +164,7 @@ sub start {
 sub finish {
     my $session = shift;
     updateTemplates($session);
+    upgradeToYUI28( $session );
     my $versionTag = WebGUI::VersionTag->getWorking($session);
     $versionTag->commit;
     $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
@@ -115,6 +176,7 @@ sub updateTemplates {
     my $session = shift;
     return undef unless (-d "packages-".$toVersion);
     print "\tUpdating packages.\n" unless ($quiet);
+    addPackage( $session, 'packages-7.7.33-7.8.13/merged.wgpkg' );
     opendir(DIR,"packages-".$toVersion);
     my @files = readdir(DIR);
     closedir(DIR);