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

defect 3348 - rmkitcomp by basename now removes all kitcomponents matching that name instead of just the highest

Browse Source
This commit is contained in:
mellor 2014-10-28 17:47:51 -04:00
parent c40c63ad77
commit 4781a420d2
2 changed files with 44 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xCAT-client/pods/man1/rmkitcomp.1.pod
View File

@ -48,7 +48,7 @@ osimage name that include this kit component.
=item B<kitcompname_list>
A comma-delimited list of valid full kit component names or kit component basenames that are to be removed from the osimage.
A comma-delimited list of valid full kit component names or kit component basenames that are to be removed from the osimage. If a basename is specified, all kitcomponents matching that basename will be removed from the osimage.
=back

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

@ -35,7 +35,7 @@ my $debianflag = 0;
my $tempstring = xCAT::Utils->osver();
if ( $tempstring =~ /debian/ || $tempstring =~ /ubuntu/ ){
$debianflag = 1;
print "debian";
# print "debian";
}
#-------------------------------------------------------
@ -2489,6 +2489,7 @@ sub rmkitcomp
}
my %kitcomps;
my @remove_kitcomps_by_basename;
my $des = shift @ARGV;
my @kitcomponents = split ',', $des;
foreach my $kitcomponent (@kitcomponents) {
@ -2519,19 +2520,22 @@ sub rmkitcomp
xCAT::MsgUtils->message( "E", \%rsp, $callback );
return 1;
}
my $highest = get_highest_version('kitcompname', 'version', 'release', @entries);
$kitcomps{$highest}{name} = $highest;
(my $kitcomptable) = $tabs{kitcomponent}->getAttribs({kitcompname => $highest}, 'kitname', 'kitpkgdeps', 'prerequisite', 'postbootscripts', 'genimage_postinstall', 'kitreponame', 'exlist', 'basename', 'driverpacks');
$kitcomps{$highest}{kitname} = $kitcomptable->{kitname};
$kitcomps{$highest}{kitpkgdeps} = $kitcomptable->{kitpkgdeps};
$kitcomps{$highest}{prerequisite} = $kitcomptable->{prerequisite};
$kitcomps{$highest}{basename} = $kitcomptable->{basename};
$kitcomps{$highest}{exlist} = $kitcomptable->{exlist};
$kitcomps{$highest}{postbootscripts} = $kitcomptable->{postbootscripts};
$kitcomps{$highest}{kitreponame} = $kitcomptable->{kitreponame};
$kitcomps{$highest}{driverpacks} = $kitcomptable->{driverpacks};
$kitcomps{$highest}{genimage_postinstall} = $kitcomptable->{genimage_postinstall};
push (@remove_kitcomps_by_basename,$kitcomponent);
foreach $basename_entry (@entries) {
my $this_entry = $basename_entry->{kitcompname};
$kitcomps{$this_entry}{name} = $this_entry;
(my $kitcomptable) = $tabs{kitcomponent}->getAttribs({kitcompname => $this_entry}, 'kitname', 'kitpkgdeps', 'prerequisite', 'postbootscripts', 'genimage_postinstall', 'kitreponame', 'exlist', 'basename', 'driverpacks');
$kitcomps{$this_entry}{kitname} = $kitcomptable->{kitname};
$kitcomps{$this_entry}{kitpkgdeps} = $kitcomptable->{kitpkgdeps};
$kitcomps{$this_entry}{prerequisite} = $kitcomptable->{prerequisite};
$kitcomps{$this_entry}{basename} = $kitcomptable->{basename};
$kitcomps{$this_entry}{exlist} = $kitcomptable->{exlist};
$kitcomps{$this_entry}{postbootscripts} = $kitcomptable->{postbootscripts};
$kitcomps{$this_entry}{kitreponame} = $kitcomptable->{kitreponame};
$kitcomps{$this_entry}{driverpacks} = $kitcomptable->{driverpacks};
$kitcomps{$this_entry}{genimage_postinstall} = $kitcomptable->{genimage_postinstall};
$kitcomps{$this_entry}{remove_by_basename} = '1';
}
}
}
# Check if the kitcomponents are existing in osimage.kitcomponents attribute.
@ -2559,13 +2563,35 @@ sub rmkitcomp
my $invalidkitcomp = '';
foreach my $kitcomp ( keys %kitcomps) {
if ( !$kitcomps{$kitcomp}{matched} ) {
if ( !$invalidkitcomp ) {
$invalidkitcomp = $kitcomp;
if ( $kitcomps{$kitcomp}{remove_by_basename} ) {
delete($kitcomps{$kitcomp});
} else {
if ( !$invalidkitcomp ) {
$invalidkitcomp = $kitcomp;
} else {
$invalidkitcomp = join(',', $invalidkitcomp, $kitcomp);
}
}
}
}
foreach $basename_to_remove (@remove_kitcomps_by_basename) {
my $removing_at_least_one = 0;
foreach my $kitcomponent (keys %kitcomps) {
if ($basename_to_remove eq $kitcomps{$kitcomponent}{basename}) {
$removing_at_least_one = 1;
last;
}
}
if (!$removing_at_least_one) {
if ( !$invalidkitcomp ) {
$invalidkitcomp = $basename_to_remove;
} else {
$invalidkitcomp = join(',', $invalidkitcomp, $basename_to_remove);
}
}
}
if ( $invalidkitcomp ) {
my %rsp;
@ -2574,6 +2600,7 @@ sub rmkitcomp
return 1;
}
# Now check if there is any other kitcomponent depending on this one.
foreach my $kitcomponent (keys %kitcomps) {