xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 17:23:08 +00:00
Code Issues Releases Wiki Activity

Wrong repository name if osminorversion doesn't have comparison operator

Browse Source
This commit is contained in:
Casandra Qiu 2016-12-06 21:25:35 -05:00
parent e9d94289aa
commit 386ae4ec06
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
xCAT-buildkit/bin/buildkit
View File

@ -1390,7 +1390,10 @@ sub validate_bldkitconf
$full_kitname .= '-' . $::bldkit_config->{kit}{entries}[0]->{osmajorversion};
}
if (defined($::bldkit_config->{kit}{entries}[0]->{osminorversion})) {
my $kitminor = split /<=|>=|==|<|>/, $::bldkit_config->{kit}{entries}[0]->{osminorversion};
my $kitminor = $::bldkit_config->{kit}{entries}[0]->{osminorversion};
unless ($kitminor =~ /^\d/) {
$kitminor = split /<=|>=|==|<|>|=/, $::bldkit_config->{kit}{entries}[0]->{osminorversion};
}
if ((!defined($::bldkit_config->{kit}{entries}[0]->{osbasename})) ||
(!defined($::bldkit_config->{kit}{entries}[0]->{osmajorversion}))) {
print "Error: Kit osminorversion attribute was specified but either Kit osbasename or Kit osmajorversion were not set. \n";
@ -1501,7 +1504,10 @@ sub validate_bldkitconf
}
$reponame .= '-' . $kr->{osmajorversion};
if (defined($kr->{osminorversion})) {
my $krminor = split /<=|>=|==|<|>/, $kr->{osminorversion};
my $krminor = $kr->{osminorversion};
unless ($krminor =~ /^\d/) {
$krminor = split /<=|>=|==|<|>|=/, $kr->{osminorversion};
}
if ((defined($::bldkit_config->{kit}{entries}[0]->{osminorversion})) &&
($::bldkit_config->{kit}{entries}[0]->{osminorversion} ne
$kr->{osminorversion})) {
@ -1552,7 +1558,10 @@ sub validate_bldkitconf
$compname .= '-' . $repo{osbasename};
$compname .= '-' . $repo{osmajorversion};
if (defined($repo{osminorversion})) {
my $minorversion = split /<=|>=|==|<|>/, $repo{osminorversion};
my $minorversion = $repo{osminorversion};
unless ($minorversion =~ /^\d/) {
$minorversion = split /<=|>=|==|<|>|=/, $repo{osminorversion};
}
$compname .= '.' . $minorversion;
}
$compname .= '-' . $repo{osarch};
@ -1937,7 +1946,10 @@ sub validate_os
my $repo_osinfo = "$repo->{osbasename}$repo->{osmajorversion}";
my $minorversion;
if (defined($repo->{osminorversion})) {
$minorversion = split /<=|>=|==|<|>/, $repo->{osminorversion};
$minorversion = $repo->{osminorversion};
unless ($minorversion =~ /^\d/) {
$minorversion = split /<=|>=|==|<|>|=/, $repo->{osminorversion};
}
$repo_osinfo .= ".$minorversion";
}
$repo_osinfo .= "-$repo->{osarch} ";