From 6f19a03dba2f02b0264ec445aa7819b5c6f14746 Mon Sep 17 00:00:00 2001 From: JT Smith Date: Sat, 27 Sep 2008 16:17:02 +0000 Subject: [PATCH] the fork method screwed up pathing so you couldn't set config file properties, and probably other things too. reverting to previous revision --- sbin/upgrade.pl | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/sbin/upgrade.pl b/sbin/upgrade.pl index ddfd74be6..1857cf393 100644 --- a/sbin/upgrade.pl +++ b/sbin/upgrade.pl @@ -226,18 +226,12 @@ foreach my $filename (keys %config) { } } if ($upgrade{$upgrade}{pl} ne "") { - my $pid = fork; - if (!$pid) { - @ARGV = ("--configFile=$filename", $quiet ? ('--quiet') : ()); - $0 = $upgrade{$upgrade}{pl}; - do $0; - exit; - } - waitpid $pid, 0; - if ($?) { - print "\tProcessing upgrade executable failed!\n"; - fatalError(); - } + my $cmd = $perl." ".$upgrade{$upgrade}{pl}." --configFile=".$filename; + $cmd .= " --quiet" if ($quiet); + if (system($cmd)) { + print "\tProcessing upgrade executable failed!\n"; + fatalError(); + } } $config{$filename}{version} = $upgrade{$upgrade}{to}; $notRun = 0;