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

fix 1660 incorrect warning message when define an osimage (#1778)

Browse Source 
* fix 1660 incorrect warning message when define an osimage

* polished

* polished
This commit is contained in:
Yuan Bai 2016-09-11 18:00:21 +08:00 committed by yangsong
parent bb460dc5ce
commit 49709e3f4d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1544,8 +1544,8 @@ sub defmk
} else {
my $invalidnodename = ();
foreach my $node (@::allobjnames) {
if (($node =~ /[A-Z]/) && ((!$::opt_t) || ($::opt_t eq "node"))) {
$invalidnodename .= ",$node";
if (($node =~ /[A-Z]/) && (((!$::opt_t) && (!$::FILEATTRS{$node}{'objtype'})) || ($::FILEATTRS{$node}{'objtype'} eq "node") || ($::opt_t eq "node"))) {
$invalidnodename .= ",$node";
}
}
if ($invalidnodename) {
@ -2783,7 +2783,7 @@ sub defch
my $newobj = ();
my $invalidnodename = ();
foreach my $node (keys %newobjects) {
if (($node =~ /[A-Z]/) && ((!$::opt_t) || ($::opt_t eq "node"))) {
if (($node =~ /[A-Z]/) && (((!$::opt_t) && (!$::FILEATTRS{$node}{'objtype'})) || ($::FILEATTRS{$node}{'objtype'} eq "node") || ($::opt_t eq "node"))) {
$invalidnodename .= ",$node";
}
$newobj .= ",$node";