From e22550566f0fbe6535c34a0256ff4387e741c267 Mon Sep 17 00:00:00 2001
From: nott <nott@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Sun, 19 Feb 2012 18:26:14 +0000
Subject: [PATCH] fix rpm flags issue

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

diff --git a/xCAT-server/lib/xcat/plugins/updatenode.pm b/xCAT-server/lib/xcat/plugins/updatenode.pm
index e0957f6e5..7b9c5ae23 100644
--- a/xCAT-server/lib/xcat/plugins/updatenode.pm
+++ b/xCAT-server/lib/xcat/plugins/updatenode.pm
@@ -1599,12 +1599,7 @@ sub doAIXcopy
             	foreach my $pkg (split(/,/, $imagedef{$img}{otherpkgs}))
             	{
 					my ($junk, $pname);
-					if (($pkg =~ /^R:/) || ($pkg =~ /^I:/) || ($pkg =~ /^E:/) )
-					{
-   						($junk, $pname) = split(/:/, $pkg);             	
-					} else {
-						$pname = $pkg;
-					}
+					$pname = $pkg;
 					if (!grep(/^$pname$/, @pkglist))
                 	{
                           push(@pkglist, $pname);
@@ -2329,7 +2324,9 @@ sub updateAIXsoftware
 
 					my $rcmd;
 					if (scalar(@rpm_pkgs)) {
-						$rcmd = qq~cd $dir; /usr/bin/rpm $flags $pkg_string 2>/dev/null~;
+						$rcmd = qq~cd $dir; /usr/bin/rpm $flags $pkg_string ~;
+					} else {
+						$rcmd = qq~/usr/bin/rpm $flags ~;
 					}
 
                     if ($::VERBOSE)
@@ -2354,6 +2351,7 @@ sub updateAIXsoftware
 						# should we always give output??
 						#   could get gobs of unwanted output in some cases
                         my $rsp;
+						push @{$rsp->{data}}, "Command output:\n";
 						foreach my $o (@$output)
                         {
                             push @{$rsp->{data}}, "$o";