From 1447febc36e8bf18b0ee7d37a545169759e93c74 Mon Sep 17 00:00:00 2001
From: nott <nott@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 11 May 2012 12:14:23 +0000
Subject: [PATCH] fix epkg parsing in otherpkgs

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

diff --git a/xCAT-server/lib/xcat/plugins/aixinstall.pm b/xCAT-server/lib/xcat/plugins/aixinstall.pm
index 891b5627d..c812e25a4 100644
--- a/xCAT-server/lib/xcat/plugins/aixinstall.pm
+++ b/xCAT-server/lib/xcat/plugins/aixinstall.pm
@@ -2036,7 +2036,6 @@ sub chkosimage
 		}
 	}
 
-
 	# get installp filesets in this dir
 	my $icmd = qq~installp -L -d $instp_srcdir | /usr/bin/cut -f2 -d':' 2>/dev/null~;
 	my @ilist = xCAT::Utils->runcmd("$icmd", -1);
@@ -11341,7 +11340,6 @@ sub checkNIMnetworks
 
 		Also does the NIM setup for additional networks if necessary.
 
-
         Arguments:
         Returns:
                 0 - OK
@@ -13438,13 +13436,17 @@ sub parse_otherpkgs
             }
             push @rpm_pkgs, $pname;    
         }
-        elsif (($p =~ /epkg\.Z/))
+
+# ndebug
+		elsif (($p =~ /epkg\.Z/) || ($p =~ /^E:/))
         {
 			if ($p =~ /:/)
 			{
 				($junk, $pname) = split(/:/, $p);
+			} else {
+				$pname = $p;
 			}
-            push @epkgs, $p;
+            push @epkgs, $pname;
         }
         else
         {