Ignore exit status when checking for CSW install failure

This commit is contained in:
Jamie Cameron
2007-06-05 22:03:26 +00:00
parent 19572094ad
commit 88d1467834
2 changed files with 3 additions and 2 deletions

View File

@@ -9,7 +9,7 @@ $pkg_get = -x "/opt/csw/bin/pkg-get" ? "/opt/csw/bin/pkg-get"
sub update_system_install
{
local $update = $_[0] || $in{'update'};
local (@rv, @newpacks);
local (@rv, @newpacks, %seen, $failed);
print "<b>",&text('csw_install', "<tt>$pkg_get -i $update</tt>"),"</b><p>\n";
$| = 1;
print "<pre>";
@@ -54,7 +54,7 @@ while(1) {
}
print "</pre>";
close($ph);
if ($? || $failed) {
if ($failed) {
print "<b>$text{'csw_failed'}</b><p>\n";
return ( );
}

View File

@@ -90,6 +90,7 @@ local ($name) = @_;
return $name eq "apache" ? "httpd" :
$name eq "dhcpd" ? "dhcp" :
$name eq "mysql" ? "mysql mysql-server mysql-devel" :
$name eq "openssh" ? "openssh openssh-server" :
$name eq "postgresql" ? "postgresql postgresql-libs postgresql-server" :
$name;
}