From 52cfc73033dc974d02192eec68de7f4bd9cc9842 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Tue, 16 Aug 2011 16:32:03 -0700
Subject: [PATCH] Alter the merged upgrade script to accept the merged upgrade
 package.

---
 docs/upgrades/upgrade_7.9.34-7.10.22.pl | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/docs/upgrades/upgrade_7.9.34-7.10.22.pl b/docs/upgrades/upgrade_7.9.34-7.10.22.pl
index 5239cbba9..33cb8dea8 100644
--- a/docs/upgrades/upgrade_7.9.34-7.10.22.pl
+++ b/docs/upgrades/upgrade_7.9.34-7.10.22.pl
@@ -554,18 +554,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.9.34-7.10.22/merged.wgpkg' );
 }
 
 #vim:ft=perl