From 50ff23fbdb8a5e1e99533656edfa87c54fde171d Mon Sep 17 00:00:00 2001 From: jjhua Date: Tue, 25 Oct 2011 08:01:16 +0000 Subject: [PATCH] fixed bug 3413154. git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10879 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT/xCAT/FSPcfg.pm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/perl-xCAT/xCAT/FSPcfg.pm b/perl-xCAT/xCAT/FSPcfg.pm index 52d6e8e40..b3cd2093f 100644 --- a/perl-xCAT/xCAT/FSPcfg.pm +++ b/perl-xCAT/xCAT/FSPcfg.pm @@ -189,11 +189,11 @@ sub parse_args { $request->{arg} = [$arg]; my $res = xCAT::PPCcfg::parse_args($request, @_); if (ref($res) eq 'ARRAY') { - my $check_cmd = &check_command($command, \%rsp); - if (!defined($check_cmd)) { + my $check_cmd = &check_command($command, \%rsp); + if (!defined($check_cmd)) { return $res; - } else { - return ([$_[0], "'$command' is only supported by nodetype $check_cmd."]); + } else { + return ([$_[0], "'$command' is only supported by type $check_cmd."]); } } else { push @ppc_cmds, $command; @@ -652,8 +652,8 @@ sub frame { ################################# # Return error ################################# - if ( $Rc != 0 ) { - return( [[$node,@$data[1],$Rc]] ); + if ( $Rc != 0 || @$data[1] =~ /Error/ ) { + return( [[$node,"@$data[1]. If just set the frame number, please wait for 5-10 minutes. Otherwise, maybe other problems cause this failure.",$Rc]] ); } push @$result, [$node,@$data[1], 0]; @@ -688,7 +688,7 @@ sub frame { } push @$result, [$node,@$data[1], 0]; - push @$result, [$node,"It will take several minutes to complete. So please wait for several minutes, then the other operations could be done. Otherwise, the other operation will fail.", 0]; + push @$result, [$node,"It will take several minutes to complete. So please wait for 5-10 minutes, then the other operations could be done. Otherwise, the other operation will fail.", 0]; } else { #################################