From 88d14678343b68c10dca8d2a2fe4c4783b334d9e Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Tue, 5 Jun 2007 22:03:26 +0000
Subject: [PATCH] Ignore exit status when checking for CSW install failure

---
 software/csw-lib.pl | 4 ++--
 software/yum-lib.pl | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/software/csw-lib.pl b/software/csw-lib.pl
index 109f95886..29646fc28 100644
--- a/software/csw-lib.pl
+++ b/software/csw-lib.pl
@@ -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 ( );
 	}
diff --git a/software/yum-lib.pl b/software/yum-lib.pl
index 2fa6999f3..e543a6565 100644
--- a/software/yum-lib.pl
+++ b/software/yum-lib.pl
@@ -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;
 }