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

Fixed a potential problem with kitcomponent.prerequisite that in some cases prerequisite is not removed from KIT_RMPKGS.otherpkg.pkglist during addkitcomp.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@16879 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
wanghuaz 2013-07-04 05:54:04 +00:00
parent 01d68774a2
commit 5881cc4268
1 changed files with 18 additions and 31 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

@ -728,6 +728,15 @@ sub assign_to_osimage
my @lines = ();
my @kitpkgdeps = split ',', $kitcomptable->{kitpkgdeps};
# Remove prerequisite from KIT_RMPKGS.otherpkg.pkglist
if ( $kitcomptable and $kitcomptable->{prerequisite} ) {
my @kitpreps = split /,/, $kitcomptable->{prerequisite};
foreach my $kitprep ( @kitpreps ) {
push @kitpkgdeps, $kitprep;
}
}
push @kitpkgdeps, $basename;
my @l = ();
@ -2739,30 +2748,18 @@ sub rmkitcomp
@kitpkgdeps = split ',', $kitcomps{$kitcomponent}{kitpkgdeps};
}
# Add prerequisite to KIT_RMPKGS.otherpkg.pkglist
if ( $kitcomps{$kitcomponent}{prerequisite} ) {
my @kitpreps = split /,/, $kitcomps{$kitcomponent}{prerequisite};
foreach my $kitprep ( @kitpreps ) {
push @kitpkgdeps, $kitprep;
}
}
push @kitpkgdeps, $basename;
my $update = 0;
#check if prerequisite rpm is already added to RMPKGS.otherpkgs.pkglist.
my $matched = 0;
foreach my $line ( @lines ) {
chomp $line;
if ( $line =~ /^-prep_$basename$/ ) {
$matched = 1;
last;
}
}
unless ( $matched ) {
# add the prerequisite rpm to #NEW_INSTALL_LIST# session
# so they can be removed in a seperate command
if ( $kitcomps{$kitcomponent}{prerequisite} ) {
push @l, "#NEW_INSTALL_LIST#\n";
push @l, "-prep_$basename\n";
}
$update = 1;
}
my $added_mark = 0;
foreach my $kitpkgdep ( @kitpkgdeps ) {
next if ( $kitpkgdep =~ /^$/ );
my $matched = 0;
@ -2775,17 +2772,7 @@ sub rmkitcomp
}
unless ( $matched ) {
# add the prerequisite rpm to #NEW_INSTALL_LIST# session
# so they can be removed in a seperate command
if ( $kitcomps{$kitcomponent}{prerequisite} ) {
if (!$added_mark) {
push @l, "#NEW_INSTALL_LIST#\n";
$added_mark = 1;
}
push @l, "-$kitpkgdep\n";
} else {
unshift @l, "-$kitpkgdep\n";
}
unshift @l, "-$kitpkgdep\n";
$update = 1;
}