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

Fix checking of comma separated lists.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@439 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
nott 2008-02-11 19:44:59 +00:00
parent e7cf67478b
commit 4c689725c6
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
perl-xCAT-2.0/xCAT/DBobjUtils.pm
View File

@ -225,9 +225,7 @@ sub getobjdefs
# if the object value is not the value we need
# to match then try the next only_if value
next
if (
!grep(/$check_value/, $objhash{$objname}{$check_attr}));
next if ( !($objhash{$objname}{$check_attr} =~ /\b$check_value\b/) );
}
# OK - get the info needed to access the DB table
@ -649,13 +647,8 @@ sub setobjdefs
# need to check the attrs we are setting for the object
# as well as the attrs for this object that may be
# already set in DB
if (
(!grep(/$check_value/, $objhash{$objname}{$check_attr}))
&& (
!grep(/$check_value/,
$DBattrvals{$objname}{$check_attr})
)
)
if ( !($objhash{$objname}{$check_attr} =~ /\b$check_value\b/) && !($DBattrvals{$objname}{$check_attr} =~ /\b$check_value\b/) )
{
next;
@ -898,11 +891,7 @@ sub rmobjdefs
# if the object attr value to check is not the value we need
# to match then try the next "only_if" value
# next if $DBattrvals{$objname}{$check_attr} ne $check_value;
next
if (
!grep(/$check_value/,
$DBattrvals{$objname}{$check_attr})
)
next if ( !($DBattrvals{$objname}{$check_attr} =~ /\b$check_value\b/) );
}