From ffe3cb5b17f44e075c57a217204522ef5c2c6923 Mon Sep 17 00:00:00 2001 From: "ian%hixie.ch" Date: Wed, 26 Dec 2001 17:45:05 +0000 Subject: [PATCH] Changed the implementation of cmdSetup to store the results of the selecting service lists in an array instead of a scalar. --- .../PLIF/Service/Components/AdminCommands.pm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/webtools/PLIF/PLIF/Service/Components/AdminCommands.pm b/webtools/PLIF/PLIF/Service/Components/AdminCommands.pm index 09107fc6d55..3cbb22155a0 100644 --- a/webtools/PLIF/PLIF/Service/Components/AdminCommands.pm +++ b/webtools/PLIF/PLIF/Service/Components/AdminCommands.pm @@ -72,20 +72,20 @@ sub verifyInput { sub cmdSetup { my $self = shift; my($app) = @_; - my $result; # call all the setup handlers until one fails: - # the setupX methods can call $app->output->setupProgress('name of component'); + # the setupX methods can call $app->output->setupProgress('component.subcomponent'); $app->getPipingServiceList('setup.events.start')->setupStarting($app); - $result = $app->getSelectingServiceList('setup.configure')->setupConfigure($app); - if (not $result) { - $result = $app->getSelectingServiceList('setup.install')->setupInstall($app); + $app->output->setupProgress('setup'); + my @result = $app->getSelectingServiceList('setup.configure')->setupConfigure($app); + if (not @result) { + @result = $app->getSelectingServiceList('setup.install')->setupInstall($app); } # report on the result - if (defined($result)) { + if (@result) { # if we failed, first report that then signal that # configuration has ended - $self->dump(9, "Failed to setup because argument '$result' was missing."); - $app->output->setupFailed($result); + $self->dump(9, "Failed to setup because argument '$result[0]' was missing."); + $app->output->setupFailed($result[0]); $app->getPipingServiceList('setup.events.end')->setupEnding($app); } else { # if it did not fail, then signal that configuration ended and