From c85c5acdeeff429ac23fa66bd10db0beb8d1cb12 Mon Sep 17 00:00:00 2001
From: mellor <mellor@us.ibm.com>
Date: Tue, 14 Oct 2014 18:35:41 -0400
Subject: [PATCH] defect 4294 - fix rmkitcomp to recognize ubuntu prerequisite
 prep-kitcomp otherpkgslist entry

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

diff --git a/xCAT-server/lib/xcat/plugins/kit.pm b/xCAT-server/lib/xcat/plugins/kit.pm
index a96754747..8516b8a51 100644
--- a/xCAT-server/lib/xcat/plugins/kit.pm
+++ b/xCAT-server/lib/xcat/plugins/kit.pm
@@ -2897,7 +2897,8 @@ sub rmkitcomp
                             $inlist = 1;
                         }
                         if ( $kitcomps{$kitcomponent}{prerequisite} ) {
-                            if ( $line =~ /^$kitreponame\/prep_$basename$/ ) {
+                            if (( $line =~ /^$kitreponame\/prep_$basename$/ ) ||
+                                ( $line =~ /^$kitreponame\/prep-$basename$/ )) {
                                 if ( $inlist ) {
                                     $num--;
                                     foreach ( 1..$num ) {