mirror of
				https://github.com/xcat2/xcat-core.git
				synced 2025-10-30 19:02:27 +00:00 
			
		
		
		
	fix rpm flags issue
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11624 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
		| @@ -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"; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user