From 8bf5624efadd470bf1df0fb7c1da701a07081259 Mon Sep 17 00:00:00 2001 From: nott Date: Tue, 24 Jan 2012 20:57:38 +0000 Subject: [PATCH] addtional mknimimage output git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11410 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/aixinstall.pm | 32 ++++++++++++++-------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/aixinstall.pm b/xCAT-server/lib/xcat/plugins/aixinstall.pm index f4502b0f4..5e640bf41 100644 --- a/xCAT-server/lib/xcat/plugins/aixinstall.pm +++ b/xCAT-server/lib/xcat/plugins/aixinstall.pm @@ -12961,6 +12961,8 @@ sub update_spot_rpm my $nimprime = shift; my $subreq = shift; + my $error; + if ($::VERBOSE) { my $rsp; @@ -12991,19 +12993,27 @@ sub update_spot_rpm if ($::RUNCMD_RC != 0) { - my $rsp; - push @{$rsp->{data}}, - "Could not install rpm packages in SPOT $spotname.\n"; - xCAT::MsgUtils->message("E", $rsp, $callback); - return 1; + $error++; } - if ($::VERBOSE) - { - my $rsp; - push @{$rsp->{data}}, "Completed Installing RPM packages in SPOT $spotname.\n"; - xCAT::MsgUtils->message("I", $rsp, $callback); - } + if ($::VERBOSE) + { + my $rsp; + push @{$rsp->{data}}, "$output\n"; + xCAT::MsgUtils->message("I", $rsp, $callback); + } + + if ($error) + { + my $rsp; + push @{$rsp->{data}}, "One or more errors occurred while installing rpm packages in SPOT $spotname.\n"; + xCAT::MsgUtils->message("E", $rsp, $callback); + return 1; + } else { + my $rsp; + push @{$rsp->{data}}, "Completed Installing RPM packages in SPOT $spotname.\n"; + xCAT::MsgUtils->message("I", $rsp, $callback); + } return 0; }