summaryrefslogtreecommitdiffstats
path: root/usr/local
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-07-01 10:58:57 -0300
committerRenato Botelho <renato@netgate.com>2015-07-01 10:58:57 -0300
commit29d84dd47e559b77311ca41de42678a822f7b72c (patch)
tree9b86f83b4aca5badf8f30ceb06cdeeaae5d7cd9d /usr/local
parent5e51b5b9be9997b203e6a43c9518706d7e7eae4e (diff)
downloadpfsense-29d84dd47e559b77311ca41de42678a822f7b72c.zip
pfsense-29d84dd47e559b77311ca41de42678a822f7b72c.tar.gz
Fix install_package calls and check for failures
Diffstat (limited to 'usr/local')
-rw-r--r--usr/local/www/pkg_mgr_install.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/local/www/pkg_mgr_install.php b/usr/local/www/pkg_mgr_install.php
index 064c593..1de2a40 100644
--- a/usr/local/www/pkg_mgr_install.php
+++ b/usr/local/www/pkg_mgr_install.php
@@ -243,7 +243,7 @@ if ($_GET) {
break;
case 'reinstallpkg':
delete_package_xml($pkgid);
- if (install_package($pkgid) < 0) {
+ if (install_package($pkgid) != 0) {
update_status(gettext("Package reinstallation failed."));
$static_output .= "\n" . gettext("Package reinstallation failed.");
update_output_window($static_output);
@@ -269,7 +269,7 @@ if ($_GET) {
if ($pkgtodo['name']) {
update_output_window($static_output);
uninstall_package($pkgtodo['name']);
- install_package($pkgtodo['name'], '', true);
+ install_package($pkgtodo['name']);
}
}
update_status(gettext("All packages reinstalled."));
@@ -284,7 +284,7 @@ if ($_GET) {
case 'installed':
default:
$status = install_package($pkgid);
- if ($status == -1) {
+ if ($status != 0) {
update_status(gettext("Installation of") . " {$pkgid} " . gettext("FAILED!"));
$static_output .= "\n" . gettext("Installation halted.");
update_output_window($static_output);
OpenPOWER on IntegriCloud