From 0a65c9fb4912a31152cea8d082c610a095bef0bc Mon Sep 17 00:00:00 2001 From: nott Date: Fri, 15 May 2009 13:00:18 +0000 Subject: [PATCH] Fix network definition error git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3393 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/DBobjectdefs.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm b/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm index fde7ba0a5..9ec3791d8 100644 --- a/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm +++ b/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm @@ -921,11 +921,12 @@ sub defmk } my %nethash = xCAT::DBobjUtils->getobjdefs(\%objhash); foreach my $o (keys %nethash) { - if ( ($nethash{$o}{net} eq $::FINALATTRS{$o}{net}) && ($nethash{$o}{mask} eq $::FINALATTRS{$o}{mask}) ) { + if ( ($nethash{$o}{net} eq $::FINALATTRS{$obj}{net}) && ($nethash{$o}{mask} eq $::FINALATTRS{$obj}{mask}) ) { my $rsp; $rsp->{data}->[0] = "A network definition called \'$o\' already exists that contains the same net and mask values. Cannot create a definition for \'$obj\'.\n"; xCAT::MsgUtils->message("E", $rsp, $::callback); $error = 1; + delete $::FINALATTRS{$obj}; next OBJ; } }