From e0bc7d22b4eddb1b5d4c625477d25feb0d9f4bf4 Mon Sep 17 00:00:00 2001 From: lissav Date: Thu, 2 Feb 2012 12:30:57 +0000 Subject: [PATCH] improvements due to 3482239 git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.6@11454 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/aixinstall.pm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/aixinstall.pm b/xCAT-server/lib/xcat/plugins/aixinstall.pm index 209f0fad2..644ac2dc7 100644 --- a/xCAT-server/lib/xcat/plugins/aixinstall.pm +++ b/xCAT-server/lib/xcat/plugins/aixinstall.pm @@ -125,8 +125,12 @@ sub preprocess_request # need for runcmd output $::CALLBACK = $cb; - # don't want preprocess to run on service node but _xcatdest is not set?? - #if ($req->{_xcatdest}) { return [$req]; } #exit if preprocessed + #if already preprocessed, go straight to request + if ( (defined($req->{_xcatpreprocessed})) + && ($req->{_xcatpreprocessed}->[0] == 1)) + { + return [$req]; + } my $nodes = $req->{node}; # this may not be the list of nodes we need! my $service = "xcat"; @@ -12169,7 +12173,7 @@ sub update_spot_rpm my $rsp; push @{$rsp->{data}}, "The following RPM packages were already installed and were not reinstalled:\n"; xCAT::MsgUtils->message("W", $rsp, $callback); - my $rsp; + $rsp ={}; foreach my $rpm (@dontinstall) { push @{$rsp->{data}}, "$rpm"; }