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

Fix for template recognition to detect major release generic templates

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.8@15826 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2013-04-04 13:04:00 +00:00
parent d652fa96fb
commit f4a9ec312c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xCAT-server/lib/perl/xCAT/SvrUtils.pm
View File

@ -551,6 +551,8 @@ sub update_tables_with_templates
if (($osver) && ($osver =~ /xCAT::SvrUtils/)) {
$osver = shift;
}
my $shortosver = $osver;
$shortosver =~ s/\..*//;
my $arch = shift; #like ppc64, x86, x86_64
my $ospkgdir=shift;
my $osdistroname=shift;
@ -608,9 +610,9 @@ sub update_tables_with_templates
my $tmpf=basename($_);
#get the profile name out of the file, TODO: this does not work if the profile name contains the '.'
if ($tmpf =~ /[^\.]*\.([^\.]*)\.([^\.]*)\./) { # osver *and* arch specific, make sure they match
unless ($1 eq $osver and $2 eq $arch) { next; }
unless (($1 eq $osver or $1 eq $shortosver) and $2 eq $arch) { next; }
} elsif ($tmpf =~ /[^\.]*\.([^\.]*)\./) { #osver *or* arch specific, make sure one matches
unless ($1 eq $osver or $2 eq $arch) { next; }
unless ($1 eq $osver or $1 eq $shortosver or $2 eq $arch) { next; }
}
$tmpf =~ /^([^\.]*)\..*$/;
$tmpf = $1;
@ -622,9 +624,9 @@ sub update_tables_with_templates
my $tmpf=basename($_);
#get the profile name out of the file, TODO: this does not work if the profile name contains the '.'
if ($tmpf =~ /[^\.]*\.([^\.]*)\.([^\.]*)\./) { # osver *and* arch specific, make sure they match
unless ($1 eq $osver and $2 eq $arch) { next; }
unless (($1 eq $osver or $1 eq $shortosver) and $2 eq $arch) { next; }
} elsif ($tmpf =~ /[^\.]*\.([^\.]*)\./) { #osver *or* arch specific, make sure one matches
unless ($1 eq $osver or $2 eq $arch) { next; }
unless ($1 eq $osver or $1 eq $shortosver or $1 eq $arch) { next; }
}
$tmpf =~ /^([^\.]*)\..*$/;
$tmpf = $1;