summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2007-04-30 21:43:20 +0000
committerScott Ullrich <sullrich@pfsense.org>2007-04-30 21:43:20 +0000
commita902a5d77e5b47374caba0115e9823b61a19fcd7 (patch)
tree61c56f9720c68b9fa8d07fece660be6b37f0d2cf
parentcf577b5ab0e98b0a678086ead99d5e6355a58f25 (diff)
downloadpfsense-a902a5d77e5b47374caba0115e9823b61a19fcd7.zip
pfsense-a902a5d77e5b47374caba0115e9823b61a19fcd7.tar.gz
Woops, use delete_package_xml() instead of delete_package()
-rw-r--r--etc/inc/pkg-utils.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc
index 50ec813..422e1cb 100644
--- a/etc/inc/pkg-utils.inc
+++ b/etc/inc/pkg-utils.inc
@@ -181,6 +181,7 @@ function get_pkg_depends($pkg_name, $filetype = ".xml", $format = "files", $retu
$package = $config['installedpackages']['package'][$pkg_id];
if(!file_exists("/usr/local/pkg/" . $package['configurationfile'])) {
log_error("The {$package['name']} package is missing required dependencies and must be reinstalled." . $package['configurationfile']);
+ delete_package_xml($package['name']);
install_package($package['name']);
return;
}
@@ -268,7 +269,7 @@ function sync_package($pkg_name, $sync_depends = true, $show_message = false) {
require_once($include_file);
} else {
log_error("Could not locate {$include_file}.");
- delete_package($package['name']);
+ delete_package_xml($package['name']);
install_package($package['name']);
}
}
@@ -288,7 +289,7 @@ function sync_package($pkg_name, $sync_depends = true, $show_message = false) {
if(!file_exists("/usr/local/pkg/" . $item)) {
file_notice($package['name'], "The {$package['name']} package is missing required dependencies and must be reinstalled.", "Packages", "/pkg_mgr_install.php?mode=reinstallpkg&pkg={$package['name']}", 1);
log_error("Could not find {$item}. Reinstalling package.");
- delete_package($pkg_name);
+ delete_package_xml($pkg_name);
install_package($pkg_name);
} else {
$item_config = parse_xml_config_pkg("/usr/local/pkg/" . $item, "packagegui");
OpenPOWER on IntegriCloud