get rid of duplicate messages on updatenode -k
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.8@16477 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
parent
962772547d
commit
81ec3ad929
@ -984,8 +984,8 @@ sub updatenode
|
||||
$::attrres{$attr} = $value;
|
||||
}
|
||||
}
|
||||
# if not just using the -k flag, then set all nodes to syncing for the
|
||||
# other updatenode options
|
||||
# if not just using the -k flag, then set all nodes to syncing in
|
||||
# nodelist updatestatus for the other updatenode options
|
||||
if (!($::SECURITY)) {
|
||||
my $stat="syncing";
|
||||
xCAT::TableUtils->setUpdateStatus(\@$nodes, $stat);
|
||||
@ -1697,10 +1697,11 @@ sub getdata
|
||||
{
|
||||
push @{$rsp->{$type}}, "$output";
|
||||
}
|
||||
}
|
||||
if (($output !~ (/Error loading module/)) && ($output !~ /^\s*(\S+)\s*:\s*Remote_command_successful/) && ($output !~ /^\s*(\S+)\s*:\s*Remote_command_failed/))
|
||||
{
|
||||
} else{ # for non -k option then get the rest of the output
|
||||
if (($output !~ (/Error loading module/)) && ($output !~ /^\s*(\S+)\s*:\s*Remote_command_successful/) && ($output !~ /^\s*(\S+)\s*:\s*Remote_command_failed/))
|
||||
{
|
||||
push @{$rsp->{$type}}, "$output";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user