summaryrefslogtreecommitdiffstats
path: root/usr/local
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2005-10-13 22:30:58 +0000
committerScott Ullrich <sullrich@pfsense.org>2005-10-13 22:30:58 +0000
commitf9b205f3211e5905cb27101c1a3674824ec6d129 (patch)
tree14b0e1eef7594802c1437926808459f01b11dd75 /usr/local
parente8f7361e8a0cc83c39efd2a84dc2273021fea995 (diff)
downloadpfsense-f9b205f3211e5905cb27101c1a3674824ec6d129.zip
pfsense-f9b205f3211e5905cb27101c1a3674824ec6d129.tar.gz
Allow -1 return to indicated package failure. Removing exit
Diffstat (limited to 'usr/local')
-rwxr-xr-xusr/local/www/pkg_mgr_install.php16
1 files changed, 11 insertions, 5 deletions
diff --git a/usr/local/www/pkg_mgr_install.php b/usr/local/www/pkg_mgr_install.php
index 2f127c5..2796bf3 100755
--- a/usr/local/www/pkg_mgr_install.php
+++ b/usr/local/www/pkg_mgr_install.php
@@ -154,10 +154,16 @@ switch($_GET['mode']) {
update_output_window($static_output);
break;
default:
- install_package($_GET['id']);
- update_status("Installation of {$_GET['id']} completed.");
- $static_output .= "\n\nInstallation completed.";
- update_output_window($static_output);
+ $status = install_package($_GET['id']);
+ if($status == -1) {
+ update_status("Installation of {$_GET['id']} FAILED!");
+ $static_output .= "\n\nInstallation halted.";
+ } else {
+ update_status("Installation of {$_GET['id']} completed.");
+ $static_output .= "\n\nInstallation completed.";
+ }
+ update_output_window($static_output);
+
}
// Delete all temporary package tarballs and staging areas.
@@ -171,4 +177,4 @@ conf_mount_ro();
if($fd_log)
fclose($fd_log);
-?>
+?> \ No newline at end of file
OpenPOWER on IntegriCloud