From 170edacf2af335541331b2fa8679550486d0988f Mon Sep 17 00:00:00 2001 From: sakolish Date: Thu, 6 Mar 2008 20:25:22 +0000 Subject: [PATCH] Display "node" in format_xml() - Line #537 git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@717 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT-2.0/xCAT/PPCscan.pm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/perl-xCAT-2.0/xCAT/PPCscan.pm b/perl-xCAT-2.0/xCAT/PPCscan.pm index 9d1e6bf70..76662ca71 100644 --- a/perl-xCAT-2.0/xCAT/PPCscan.pm +++ b/perl-xCAT-2.0/xCAT/PPCscan.pm @@ -21,7 +21,7 @@ my @header = ( ["serial-number", "%-15s" ], ["address", "%s\n" ]); -my @attribs = qw(nodetype name id model serial hcp profile parent groups mgt); +my @attribs = qw(nodetype node id model serial hcp profile parent groups mgt); my %nodetype = ( fsp => $::NODETYPE_FSP, bpa => $::NODETYPE_BPA, @@ -477,7 +477,7 @@ sub format_stanza { foreach ( @attribs ) { my $d = $data[$i++]; - if ( /^name$/ ) { + if ( /^node$/ ) { next; } elsif ( /^nodetype$/ ) { $d = $nodetype{$d}; @@ -537,9 +537,7 @@ sub format_xml { foreach ( @attribs ) { my $d = $data[$i++]; - if ( /^name$/ ) { - next; - } elsif ( /^nodetype$/ ) { + if ( /^nodetype$/ ) { $d = $nodetype{$d}; } elsif ( /^groups$/ ) { $d = "$type,all"; @@ -600,3 +598,4 @@ sub rscan { +