From ac28aa7e16ffd428b9448af9fa4d57675b0b7840 Mon Sep 17 00:00:00 2001 From: zhaoertao Date: Thu, 8 Nov 2012 02:16:07 +0000 Subject: [PATCH] fix bug 3164:"rinv deconfig" can not print out the deconfig resources git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@14269 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT/xCAT/FSPinv.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/perl-xCAT/xCAT/FSPinv.pm b/perl-xCAT/xCAT/FSPinv.pm index f49d30d66..8c56eaf21 100644 --- a/perl-xCAT/xCAT/FSPinv.pm +++ b/perl-xCAT/xCAT/FSPinv.pm @@ -287,15 +287,21 @@ sub deconfig { my $Location_code; my $RID; my $TYPE; - if(ref($node->{GARDRECORD}) ne "ARRAY") { + my $dres; + if (ref($node->{GARDRECORD}) eq "ARRAY") { + $dres = $node->{GARDRECORD}; + } elsif (ref($node->{GARDRECORD}) eq "HASH") { + push @$dres, $node->{GARDRECORD}; + } else { push @result,[$name,"NO Deconfigured resources", 0]; return( \@result ); } push @result,[$name,"Deconfigured resources", 0]; push @result,[$name,"Location_code RID Call_Out_Method Call_Out_Hardware_State TYPE", 0]; push @result,[$name,"$node->{Location_code} $node->{RID}", 0]; - foreach my $unit(@{$node->{GARDRECORD}}) { + #foreach my $unit(@{$node->{GARDRECORD}}) { + foreach my $unit(@$dres) { while (my ($key, $unit3) = each(%$unit) ) { if($key eq "GARDUNIT") {