From 359ba4afd3ffad9bcaeed30542b05f000ff24602 Mon Sep 17 00:00:00 2001
From: amy0701 <bybai@cn.ibm.com>
Date: Mon, 6 Jul 2015 08:23:16 -0400
Subject: [PATCH] defect 4730 addkitcomp/rmkitcomp cannot copy/remove kitcomp
 to otherpkgdir when there are mixed http and local dir in otherpkgdir

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

diff --git a/xCAT-server/lib/xcat/plugins/kit.pm b/xCAT-server/lib/xcat/plugins/kit.pm
index 20a771fbe..b20cf4602 100644
--- a/xCAT-server/lib/xcat/plugins/kit.pm
+++ b/xCAT-server/lib/xcat/plugins/kit.pm
@@ -351,6 +351,35 @@ sub check_newinstall
 }
 
 
+#-------------------------------------------------------
+
+=head3 get local otherpkgdir
+
+  otherpkgdir can be mixed http source and local dir
+  Split otherpkgdir 
+  get local otherpkgdir
+
+=cut
+
+#-------------------------------------------------------
+
+sub get_local_otherpkgdir
+{
+      $otherpkgdir = shift;
+      my $localdir = "";
+      my @tempdirarray = split /,/, $otherpkgdir;
+         foreach my $tempdir (@tempdirarray){
+             $tempdir=~s/(^ +| +$)//g;
+             if ($tempdir !~ /^http.*/){
+                  $localdir = $tempdir;
+                  last;
+             }
+        }
+     return $localdir;  
+      
+}
+
+
 #-------------------------------------------------------
 
 =head3 assign_to_osimage
@@ -397,6 +426,9 @@ sub assign_to_osimage
                 my $rootimgdir;
                 if ( $linuximagetable and $linuximagetable->{otherpkgdir} ) {
                     $otherpkgdir = $linuximagetable->{otherpkgdir};
+                    #support mixed otherpkgdir http and local dir
+                    $otherpkgdir = get_local_otherpkgdir($otherpkgdir);
+
                 } else {
                     $callback->({error => ["Could not read otherpkgdir from osimage $osimage"],errorcode=>[1]});
                     return 1;
@@ -576,6 +608,8 @@ sub assign_to_osimage
 
             if ( $linuximagetable and $linuximagetable->{otherpkgdir} ) {
                 my $otherpkgdir = $linuximagetable->{otherpkgdir};
+                #support mixed otherpkgdir http and local dir
+                $otherpkgdir = get_local_otherpkgdir($otherpkgdir);
                 my $kitrepodir = $kitrepotable->{kitrepodir};
 
                 # Create otherpkgdir if it doesn't exist
@@ -2743,6 +2777,8 @@ sub rmkitcomp
     if ( $linuximagetable and $linuximagetable->{otherpkgdir} ) {
 
         my $otherpkgdir = $linuximagetable->{otherpkgdir};
+        #support mixed otherpkgdir http and local dir
+        $otherpkgdir = get_local_otherpkgdir($otherpkgdir);
         foreach my $kitcomponent (keys %kitcomps) {
 
             my %newosikitcomponents;
@@ -3265,6 +3301,8 @@ sub rmkitcomp
     if ( $linuximagetable and $linuximagetable->{otherpkgdir} ) {
 
         my $otherpkgdir = $linuximagetable->{otherpkgdir};
+        $otherpkgdir = get_local_otherpkgdir($otherpkgdir);
+
         foreach my $kitcomponent (keys %kitcomps) {
 
             my %newosikitcomponents;