From d16eaee9f5b4c2d52b0bfbd5ff8f854910dc831d Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 31 Oct 2008 12:16:28 +0000
Subject: [PATCH] nodels -h returns fatal error

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2430 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/tabutils.pm | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/tabutils.pm b/xCAT-server/lib/xcat/plugins/tabutils.pm
index f0877a237..6d96a0c71 100644
--- a/xCAT-server/lib/xcat/plugins/tabutils.pm
+++ b/xCAT-server/lib/xcat/plugins/tabutils.pm
@@ -835,17 +835,6 @@ sub nodels
         push @{$rsp{data}}, "  nodels [noderange] [-H|--with-fieldname] [table.attribute | shortname] [...]";
         push @{$rsp{data}}, "  nodels {-v|--version}";
         push @{$rsp{data}}, "  nodels [-?|-h|--help]";
-#####  xcat 1.2 nodels usage:
-        #     $rsp->{data}->[1]= "  nodels [noderange] [group|pos|type|rg|install|hm|all]";
-        #     $rsp->{data}->[2]= " ";
-        #     $rsp->{data}->[3]= "  nodels [noderange] hm.{power|reset|cad|vitals|inv|cons}";
-        #     $rsp->{data}->[4]= "                     hm.{bioscons|eventlogs|getmacs|netboot}";
-        #     $rsp->{data}->[5]= "                     hm.{eth0|gcons|serialbios|beacon}";
-        #     $rsp->{data}->[6]= "                     hm.{bootseq|serialbps|all}";
-        #     $rsp->{data}->[7]= " ";
-        #     $rsp->{data}->[8]= "  nodels [noderange] rg.{tftp|nfs_install|install_dir|serial}";
-        #     $rsp->{data}->[9]= "                     rg.{usenis|install_roll|acct|gm|pbs}";
-        #     $rsp->{data}->[10]="                     rg.{access|gpfs|netdevice|prinic|all}";
         if ($exitcode) { $rsp{errorcode} = $exitcode; }
         $callback->(\%rsp);
     };
@@ -856,10 +845,11 @@ sub nodels
         @ARGV=();
     }
     my $NOTERSE;
-    if (!GetOptions('h|?|help'  => \$HELP, 'H|with-fieldname' => \$NOTERSE, 'v|version' => \$VERSION,) ) { nodels_usage->(1); return; }
+
+   if (!GetOptions('h|?|help'  => \$HELP, 'H|with-fieldname' => \$NOTERSE, 'v|version' => \$VERSION,) ) { $nodels_usage->(1); return; }
 
     # Help
-    if ($HELP) { nodels_usage->(0); return; }
+    if ($HELP) { $nodels_usage->(0); return; }
 
     # Version
     if ($VERSION)