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

For kit component external packages, the external packages names are always changed, for example, there might be different versions. in buildkit.conf, external packages should be set with certain names, and buildkit command should not require certain package names. they could work with basename only.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14860 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
wanghuaz 2013-01-11 11:06:15 +00:00
parent 92931c7bb9
commit df090f8a4a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xCAT-buildkit/bin/buildkit
View File

@ -1238,7 +1238,7 @@ sub validate_bldkitconf
$d =~ s/^([\w\.\-]+)[<>=]*.*$/$1/;
my $found = 0;
foreach my $kp (@{$::bldkit_config->{kitpackage}{entries}}) {
if ( $kp->{filename} =~ /^$d[\.\-]/ ) {
if ( $kp->{filename} =~ /^$d[\.\-]?/ ) {
foreach my $kprid (split(/,/, $kp->{kitrepoid})) {
$kprid =~ s/\s+//g;
if ($kc->{kitrepoid} eq $kprid) {
@ -2304,8 +2304,8 @@ sub kit_addpkgs
next;
}
if ( ($ext_filename ne '') && ($ext_reponames ne '') ){
my $fromfile = $rpmdir."/".$ext_filename;
if ( !(-r $fromfile) ){
my $fromfile = $rpmdir."/".$ext_filename."*";
if ( system("ls $fromfile") ){
print "The product package file $ext_filename could not be read from the package directory $rpmdir. \n";
# Cleanup
system ("rm -Rf /tmp/buildkit_workdir");