arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

defect 3503 - remove duplicates and sort output of lskmodules

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@15983 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
mellor 2013-04-16 13:20:46 +00:00
parent f4acade014
commit b3c503a8d0
1 changed files with 68 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
xCAT-server/lib/xcat/plugins/kmodules.pm
View File

@ -303,35 +303,37 @@ sub lskmodules {
}
# Get the list of kernel modules in each rpm/img file
my @modlist;
foreach my $source (@sources) {
my @modlist;
if ( $source =~ /^dud:/ ) {
$source =~ s/^dud://;
@modlist = &mods_in_img($source);
push (@modlist, &mods_in_img($source) );
} else {
$source =~ s/^rpm://;
@modlist = &mods_in_rpm($source);
push (@modlist, &mods_in_rpm($source) );
}
# Return the module list for this rpm/img file
my $rsp;
foreach my $mn (@modlist) {
if ($::opt_x) {
my %data_entry;
$data_entry{module}->{name}=$mn->{name};
$data_entry{module}->{description}=$mn->{description};
push @{ $rsp->{data} }, \%data_entry;
} else {
push @{ $rsp->{data} }, $mn->{name}.': '.$mn->{description};
}
}
#xCAT::MsgUtils->message( "I", $rsp, $::CALLBACK );
if ( $rsp ) {
$::CALLBACK->($rsp);
}
}
@modlist = &remove_duplicate_mods(\@modlist);
# Return the module list for this rpm/img file
my $rsp;
foreach my $mn (@modlist) {
if ($::opt_x) {
my %data_entry;
$data_entry{module}->{name}=$mn->{name};
$data_entry{module}->{description}=$mn->{description};
push @{ $rsp->{data} }, \%data_entry;
} else {
push @{ $rsp->{data} }, $mn->{name}.': '.$mn->{description};
}
}
#xCAT::MsgUtils->message( "I", $rsp, $::CALLBACK );
if ( $rsp ) {
$::CALLBACK->($rsp);
}
return $rc;
}
#----------------------------------------------------------------------------
@ -667,4 +669,49 @@ sub mods_in_img {
return @modlist;
}
#----------------------------------------------------------------------------
=head3 remove_duplicate_mods
return array of unique module names/descriptions hashes from input array
Arguments:
Returns:
0 - OK
1 - error
Globals:
Error:
Example:
Comments:
=cut
#-----------------------------------------------------------------------------
sub remove_duplicate_mods {
my $modlist = shift;
my %unique_names;
my @return_list;
foreach my $mn (@$modlist) {
if ( defined($unique_names{$mn->{name}}) ) { next;}
$unique_names{$mn->{name}} = $mn->{description};
}
foreach my $un (sort keys(%unique_names)) {
my %mod;
$mod{name} = $un;
$mod{description} = $unique_names{$un};
push (@return_list, \%mod);
}
return @return_list;
}
1;