From cf9636ae45b616f445701368bb2462539b08a579 Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Wed, 6 Jul 2016 03:36:16 -0400
Subject: [PATCH] fix 1327 after pessl kitcomponents are removed from osimage,
 the INCLUDE env file for pessl are not cleaned up.

---
 xCAT-server/lib/xcat/plugins/kit.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/kit.pm b/xCAT-server/lib/xcat/plugins/kit.pm
index 9188ca729..74f1c3e78 100644
--- a/xCAT-server/lib/xcat/plugins/kit.pm
+++ b/xCAT-server/lib/xcat/plugins/kit.pm
@@ -3205,7 +3205,7 @@ sub rmkitcomp
                         #check if the parameter is used by other kitcomponent
                         foreach my $otherline ( @otherlines ) {
                             chomp $otherline;
-                            if ( $line =~ m!$otherline! ) {
+                            if ( $otherline && $line =~ m!$otherline! ) {
                                 $found = 1;
                                 last;
                             }
@@ -3216,7 +3216,7 @@ sub rmkitcomp
                         } else {
                             foreach my $content ( @contents ) {
                                 chomp $content;
-                                if ( $line =~ m!$content! ) {
+                                if ( $content && $line =~ m!$content! ) {
                                     $found = 1;
                                     last;
                                 }