From c94e676f597cd402bd104c26a8f83df10777da4b Mon Sep 17 00:00:00 2001
From: mxi1 <mxi1@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 14 Apr 2009 15:51:20 +0000
Subject: [PATCH] -bug#2740264, add the warning message if there's no exclusion
 list file;

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

diff --git a/xCAT-server/lib/xcat/plugins/packimage.pm b/xCAT-server/lib/xcat/plugins/packimage.pm
index 66589f42d..b47ea1522 100644
--- a/xCAT-server/lib/xcat/plugins/packimage.pm
+++ b/xCAT-server/lib/xcat/plugins/packimage.pm
@@ -27,6 +27,11 @@ sub process_request {
       $installroot = $ent->{value};
    }
    @ARGV = @{$request->{arg}};
+   my $argc = scalar @ARGV;
+   if ($argc == 0) {
+       $callback->({info=>["packimage -h \npackimage -v \npackimage [-p profile] [-a architecture] [-o OS] [-m method]\n"]});
+       return;
+   }
     my $osver;
     my $arch;
     my $profile;
@@ -44,7 +49,7 @@ sub process_request {
       $callback->({info=>[$version]});
       return;
    }
-   if ($help || scalar @ARGV == 0) {
+   if ($help) {
       $callback->({info=>["packimage -h \npackimage -v \npackimage [-p profile] [-a architecture] [-o OS] [-m method]\n"]});
       return;
    }
@@ -64,11 +69,10 @@ sub process_request {
     my $exlistloc=get_exlist_file_name("$installroot/custom/netboot/$distname", $profile, $osver, $arch);
     if (!$exlistloc) {  $exlistloc=get_exlist_file_name("$::XCATROOT/share/xcat/netboot/$distname", $profile, $osver, $arch); }
 
-    #if (!$exlistloc)
-    #{
-    #   $callback->({error=>["Unable to find file exclusion list under $installroot/custom/netboot/$distname or $::XCATROOT/share/xcat/netboot/$distname/ for $profile/$arch/$osver"],errorcode=>[1]});
-    #   next;
-    #}
+    if (!$exlistloc)
+    {
+        $callback->({data=>["WARNING: Unable to find file exclusion list under $installroot/custom/netboot/$distname or $::XCATROOT/share/xcat/netboot/$distname/ for $profile/$arch/$osver\n"]});
+    }
     #print "exlistloc=$exlistloc\n";
 
     my $excludestr = "find . ";