From e3bc094b77610c754634c6afa64162169b8889af Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Sun, 31 Dec 2017 23:59:59 +0000
Subject: [PATCH] Remove trailing spaces in file
 xCAT-server/lib/xcat/plugins/DBobjectdefs.pm

---
 xCAT-server/lib/xcat/plugins/DBobjectdefs.pm | 24 ++++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm b/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
index d454abaf4..748d07792 100755
--- a/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
+++ b/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
@@ -1572,11 +1572,11 @@ sub defmk
             unless(isobjnamevalid($node,$myobjtype)){
                $invalidobjname .= ",$node";
             }
-            if (((!$::opt_t) && (!$::FILEATTRS{$node}{'objtype'})) || ($::FILEATTRS{$node}{'objtype'} eq "node") || ($::opt_t eq "node")) { 
+            if (((!$::opt_t) && (!$::FILEATTRS{$node}{'objtype'})) || ($::FILEATTRS{$node}{'objtype'} eq "node") || ($::opt_t eq "node")) {
                 if($node =~ /[A-Z]/){
                     $invalidnodename .= ",$node";
                 }elsif($node =~ /\./){
-                    $nodewithdomain .= ",$node"; 
+                    $nodewithdomain .= ",$node";
                 }
             }
         }
@@ -2447,10 +2447,10 @@ sub defch
                 # the netname already exists
                 if ($isDefined)
                 {
-                    # when net is empty, chdef command should add net value, $::FINALATTRS{$obj}{net} should have value 
-                    if ((!$nethash{$o}{net}) && (!$::FINALATTRS{$obj}{net}))                
+                    # when net is empty, chdef command should add net value, $::FINALATTRS{$obj}{net} should have value
+                    if ((!$nethash{$o}{net}) && (!$::FINALATTRS{$obj}{net}))
                     {
-                        $isInvalid=1; 
+                        $isInvalid=1;
                         my $rsp;
                         $rsp->{data}->[0] = "Attribute \'net\' is not specified for network entry \'$obj\', skipping.";
                         xCAT::MsgUtils->message("E", $rsp, $::callback);
@@ -2468,10 +2468,10 @@ sub defch
                          last;
                      }
                 }
-                # the netname does not exist 
+                # the netname does not exist
                 else {
                      # there is a network definition already contains the same net and mask, it is duplicate
-                     if (($nethash{$o}{net} eq $::FINALATTRS{$obj}{net}) && ($nethash{$o}{mask} eq $::FINALATTRS{$obj}{mask})) 
+                     if (($nethash{$o}{net} eq $::FINALATTRS{$obj}{net}) && ($nethash{$o}{mask} eq $::FINALATTRS{$obj}{mask}))
                      {
                          $isInvalid=1;
                          my $rsp;
@@ -2480,7 +2480,7 @@ sub defch
                          $error = 1;
                          last;
                      }
- 
+
                 }
 
             }
@@ -4454,7 +4454,7 @@ sub defrm
                     push @allnodes, $single_object;
                 }
             }
-            # If cleaning up (issuing nodeset offline) for more than cleanup_msg_trigger node, 
+            # If cleaning up (issuing nodeset offline) for more than cleanup_msg_trigger node,
             # issue info message
             if (@allnodes > $cleanup_msg_trigger) {
                my $rsp;
@@ -4763,7 +4763,7 @@ sub initialize_variables
 #isobjnamevalid:
 #description: check whether the object name is valid
 #argument:
-#          $objname: the object name string 
+#          $objname: the object name string
 #          $objtype: the object type string
 #return:
 #          1: valid
@@ -4777,7 +4777,7 @@ sub isobjnamevalid{
     $options{genericrange}=1;
     $objtype="node" unless(defined $objtype and ($objtype ne ""));
     if($objtype eq "node"){
-        #the ip address as a valid node object name is a hack for p7IH support   
+        #the ip address as a valid node object name is a hack for p7IH support
         if(($objname !~ /^[a-zA-Z0-9-_]+$/) and !xCAT::NetworkUtils->isIpaddr($objname)){
             return 0;
         }
@@ -4785,7 +4785,7 @@ sub isobjnamevalid{
         my @tmpnodes=xCAT::NodeRange::noderange($objname,0,0,%options);
         if(scalar(@tmpnodes)>1 || $tmpnodes[0] ne $objname ){
            return 0;
-        }    
+        }
     }
     return 1;
 }