From 6f4e3415ea65c81b4d0bba195d9383d0401188a2 Mon Sep 17 00:00:00 2001 From: Graham Knop Date: Tue, 21 Sep 2010 13:12:44 -0500 Subject: [PATCH] run upgrades in alphabetical order --- lib/WebGUI/Upgrade.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/WebGUI/Upgrade.pm b/lib/WebGUI/Upgrade.pm index c6af468cc..aa17e12aa 100644 --- a/lib/WebGUI/Upgrade.pm +++ b/lib/WebGUI/Upgrade.pm @@ -323,6 +323,7 @@ sub runUpgradeStep { my ($version) = $step =~ /-(\d+\.\d+\.\d+)$/; my $upgradesDir = File::Spec->catdir(WebGUI::Paths->upgrades, $step); + my @files; opendir my($dh), $upgradesDir or die "Can't get upgrades for $step: $!\n"; while ( my $upgradeFile = readdir $dh ) { next @@ -330,9 +331,12 @@ sub runUpgradeStep { my $filename = File::Spec->catfile($upgradesDir, $upgradeFile); next unless -f $filename; - $self->runUpgradeFile($configFile, $version, $filename); + push @files, $filename; } closedir $dh; + for my $filename ( sort @files ) { + $self->runUpgradeFile($configFile, $version, $filename); + } $self->markVersionUpgrade($configFile, $version); }