From 825200be39e04547ebcbe2dc1598501e2268d65d Mon Sep 17 00:00:00 2001 From: lissav Date: Wed, 19 Jan 2011 13:32:35 +0000 Subject: [PATCH] fix postscript output git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8702 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT/xCAT/DSHCLI.pm | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/perl-xCAT/xCAT/DSHCLI.pm b/perl-xCAT/xCAT/DSHCLI.pm index ef925b805..eea2fafe6 100644 --- a/perl-xCAT/xCAT/DSHCLI.pm +++ b/perl-xCAT/xCAT/DSHCLI.pm @@ -4761,12 +4761,8 @@ sub run_rsync_postscripts my @newoutput= (); my $dshparms; my $firstpass=1; - my $rsp = {}; foreach my $postsfile (@::postscripts) { my $tmppostfile = $postsfile ; - #my $rsp = {}; - #$rsp->{data}->[0] = " postscripts = $postsfile"; - #xCAT::MsgUtils->message("I", $rsp, $::CALLBACK); # remove first character, we have to do this because the # return from rsync is tmp/file1 not /tmp/file1 @@ -4777,8 +4773,6 @@ sub run_rsync_postscripts } substr($tmppostfile,0,1)=""; - #$rsp->{data}->[0] = " postscripts = $tmppostfile"; - #xCAT::MsgUtils->message("I", $rsp, $::CALLBACK); # now remove .post from the postscript file for the compare # with the returned file name my($tp,$post) = split(/.post/,$tmppostfile); @@ -4813,15 +4807,16 @@ sub run_rsync_postscripts my $tmpp=$syncdir . $ps; $ps=$tmpp; } - # my $rsp = {}; - # $rsp->{data}->[0] = " postscripts = $ps"; - # xCAT::MsgUtils->message("I", $rsp, $::CALLBACK); $out=xCAT::Utils->runxcmd( { command => ['xdsh'], node => \@nodes, arg => [ "-e", $ps ] - }, $::SUBREQ, 0); - push @newoutput,$out; + }, $::SUBREQ, 0,1); + foreach my $r (@$out){ + push(@newoutput, $r); + + } + } return @newoutput;