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

fix for bug 3476: set @::finalTypeList based on both CLI and FILEATTR

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@15977 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
ligc 2013-04-16 02:48:38 +00:00
parent 3f51657eef
commit e8edeca80c
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
View File

@ -2536,6 +2536,9 @@ sub setFINALattrs
my $error = 0;
# set the final hash based on the info from the file hash and cmd line hash
@::finalTypeList = ();
# set the final hash based on the info from the input file
if (@::fileobjnames)
{
@ -2598,6 +2601,15 @@ sub setFINALattrs
{
$::FINALATTRS{$objname}{$attr} =
$::FILEATTRS{$objname}{$attr};
if ($attr eq 'objtype')
{
if (!grep(/^$::FINALATTRS{$objname}{objtype}$/, @::finalTypeList))
{
my $type = $::FINALATTRS{$objname}{objtype};
chomp $type;
push @::finalTypeList, $type;
}
}
}
}
@ -2609,9 +2621,6 @@ sub setFINALattrs
}
}
# set the final hash based on the info from the cmd line hash
@::finalTypeList = ();
foreach my $objname (@::clobjnames)
{
# special case for the nic* attributes