Remove all the old entries for rscan -u option

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5554 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
wanghuaz 2010-03-23 04:42:47 +00:00
parent 6e46cfff6a
commit 52e47c0fdc

View File

@ -247,22 +247,19 @@ sub update_ppc {
if ( $vpdent->{mtm} eq $model && $vpdent->{serial} eq $serial && $vpdent->{side} eq $side )
{
$predefined_node = $vpdent->{node};
last;
if ( $predefined_node =~ /-B$/ ) {
$name = $name . "-B";
}
if ( update_node_attribs($hwtype, $type, $name, $id, $model, $serial, $side,
$server, $pprofile, $parent, $ips,
\%db, $predefined_node, \@ppclist))
{
push @update_list, $value;
}
}
}
next if ( !$predefined_node);
if ( $predefined_node =~ /-B$/ ) {
$name = $name . "-B";
}
if ( update_node_attribs($hwtype, $type, $name, $id, $model, $serial, $side,
$server, $pprofile, $parent, $ips,
\%db, $predefined_node, \@ppclist))
{
push @update_list, $value;
}
}
my @newppclist = $db{ppc}->getAllNodeAttribs(['node','hcp','id',
@ -291,23 +288,20 @@ sub update_ppc {
if ( $vpdent->{mtm} eq $model && $vpdent->{serial} eq $serial && $vpdent->{side} eq $side )
{
$predefined_node = $vpdent->{node};
last;
if ( $predefined_node =~ /-A$/ ) {
$name = $name . "-A";
} elsif ( $predefined_node =~ /-B$/ ) {
$name = $name . "-B";
}
if (update_node_attribs($hwtype, $type, $name, $id, $model, $serial, $side,
$server, $pprofile, $parent, $ips,
\%db, $predefined_node, \@newppclist))
{
push @update_list, $value;
}
}
}
next if ( !$predefined_node);
if ( $predefined_node =~ /-A$/ ) {
$name = $name . "-A";
} elsif ( $predefined_node =~ /-B$/ ) {
$name = $name . "-B";
}
if (update_node_attribs($hwtype, $type, $name, $id, $model, $serial, $side,
$server, $pprofile, $parent, $ips,
\%db, $predefined_node, \@newppclist))
{
push @update_list, $value;
}
}
###################################