From 48422f11de7f0977e288d9cd8bd76eb4607a1fa2 Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Tue, 28 Jun 2016 04:10:52 -0400
Subject: [PATCH] update issue 1326

---
 xCAT-server/lib/xcat/plugins/kit.pm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/xCAT-server/lib/xcat/plugins/kit.pm b/xCAT-server/lib/xcat/plugins/kit.pm
index 357e65b91..9188ca729 100644
--- a/xCAT-server/lib/xcat/plugins/kit.pm
+++ b/xCAT-server/lib/xcat/plugins/kit.pm
@@ -1636,6 +1636,12 @@ sub rmkit
 
                             # Remove this component from osimage.kitcomponents. Mark here.
                             my $ret = xCAT::Utils->runxcmd({ command => ['rmkitcomp'], arg => ['-f','-i',$entry->{imagename}, $kitcompname] }, $request_command, 0, 1);
+                            if ( $::RUNCMD_RC ) {
+                                my %rsp;
+                                push@{ $rsp{data} }, "Failed to remove kit component $kitcomponent from $entry->{imagename}";
+                                xCAT::MsgUtils->message( "E", \%rsp, $callback );
+                                return 1;
+                            }
                         }
                     }
                 }
@@ -2640,7 +2646,7 @@ sub rmkitcomp
                     unless (@entries) {
                         my %rsp;
                         push@{ $rsp{data} }, "kitcomponent $kitcompdep basename does not exist";
-                        xCAT::MsgUtils->message( "E", \%rsp, $callback );
+                        xCAT::MsgUtils->message( "W", \%rsp, $callback );
                     }
 
                     my $kitcompdepname = get_highest_version('kitcompname', 'version', 'release', @entries);