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

fix for bug 2984196, check for site name

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6311 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
ligc 2010-06-02 09:43:30 +00:00
parent 1de6b0b66e
commit 0118e0ff31
1 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2586,19 +2586,16 @@ sub defls
# Get all the objects of this type
my @allobjoftype;
if ($type ne 'site')
{
@allobjoftype = xCAT::DBobjUtils->getObjectsOfType($type);
@allobjoftype = xCAT::DBobjUtils->getObjectsOfType($type);
unless (@allobjoftype)
{
my $rsp;
$rsp->{data}->[0] =
"Could not find any objects of type \'$type\'.";
xCAT::MsgUtils->message("I", $rsp, $::callback);
next;
}
} # end - if not site table
unless (@allobjoftype)
{
my $rsp;
$rsp->{data}->[0] =
"Could not find any objects of type \'$type\'.";
xCAT::MsgUtils->message("I", $rsp, $::callback);
next;
}
my @attrlist;
if (($type ne 'site') && ($type ne 'monitoring'))
@ -2639,23 +2636,19 @@ sub defls
}
}
# if anything but the site table do this
if ($type ne 'site')
# check the object names only if
# the object names are passed in through command line
if ($::objectsfrom_args || $::opt_o || (($type eq 'node') && ($::opt_o || @::noderange)))
{
# check the object names only if
# the object names are passed in through command line
if ($::objectsfrom_args || $::opt_o || (($type eq 'node') && ($::opt_o || @::noderange)))
if (!grep(/^$obj$/, @allobjoftype))
{
if (!grep(/^$obj$/, @allobjoftype))
{
my $rsp;
$rsp->{data}->[0] =
"Could not find an object named \'$obj\' of type \'$type\'.";
xCAT::MsgUtils->message("I", $rsp, $::callback);
next;
}
}
} # end - if not site table
my $rsp;
$rsp->{data}->[0] =
"Could not find an object named \'$obj\' of type \'$type\'.";
xCAT::MsgUtils->message("I", $rsp, $::callback);
next;
}
}
# special handling for site table - for now !!!!!!!
if (($type eq 'site') || ($type eq 'monitoring'))