From 1e32434db2c06adfad3a33848362c025b815e1b6 Mon Sep 17 00:00:00 2001 From: nott Date: Sun, 19 Feb 2012 18:35:15 +0000 Subject: [PATCH] fix rpm flags issue git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.6@11625 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/updatenode.pm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/updatenode.pm b/xCAT-server/lib/xcat/plugins/updatenode.pm index f048650fe..0b4941bb0 100644 --- a/xCAT-server/lib/xcat/plugins/updatenode.pm +++ b/xCAT-server/lib/xcat/plugins/updatenode.pm @@ -1596,12 +1596,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); @@ -2308,7 +2303,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)