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

Check if the deploy parameter is used by other kitcomponent that is not in the same kit

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@16064 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
wanghuaz 2013-04-25 12:56:34 +00:00
parent 775941db70
commit e78b7a27f6
1 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
xCAT-server/lib/xcat/plugins/kit.pm
View File

@ -17,7 +17,7 @@ use xCAT::Table;
use xCAT::Utils;
use xCAT::MsgUtils;
use Getopt::Long;
use Data::Dumper;
#use Data::Dumper;
use File::Basename;
use File::Path;
@ -2516,20 +2516,59 @@ sub rmkitcomp
}
}
# Check if each deploy parameter is used by other kitcomponent.
my @otherlines = ();
foreach my $osikitcomp ( @osikitcomps ) {
next if ( exists($kitcomps{$osikitcomp}{name}) );
(my $kitcomptable) = $tabs{kitcomponent}->getAttribs({kitcompname=> $osikitcomp}, 'kitname');
if ( $kitcomptable and $kitcomptable->{kitname} ) {
(my $kittable) = $tabs{kit}->getAttribs({kitname=> $kitcomptable->{kitname}}, 'kitdir', 'kitdeployparams');
if ( $kittable and $kittable->{kitdeployparams} and $kittable->{kitdir} ) {
my @otherdeployparams;
my $deployparam_file = $kittable->{kitdir}."/other_files/".$kittable->{kitdeployparams};
if ( -e "$deployparam_file" ) {
if (open(OTHERDEPLOYPARAM, "<", "$deployparam_file" )) {
@otherdeployparams = <OTHERDEPLOYPARAM>;
close(OTHERDEPLOYPARAM);
}
}
foreach ( @otherdeployparams ) {
push @otherlines, $_;
}
}
}
}
my @newcontents = ();
foreach my $line ( @lines ) {
chomp $line;
my $found = 0;
foreach my $content ( @contents ) {
chomp $content;
if ( $line =~ /$content/ ) {
#check if the parameter is used by other kitcomponent
foreach my $otherline ( @otherlines ) {
chomp $otherline;
if ( $line =~ /$otherline/ ) {
$found = 1;
last;
}
}
unless ( $found ) {
if ( $found ) {
push @newcontents, $line . "\n";
} else {
foreach my $content ( @contents ) {
chomp $content;
if ( $line =~ /$content/ ) {
$found = 1;
last;
}
}
unless ( $found ) {
push @newcontents, $line . "\n";
}
}
}