From 86af45ecbed9fc0dddfd840c6384e015fe8a597f Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Thu, 6 Jan 2011 17:48:33 -0500 Subject: [PATCH] Ensure $pkg is defined. Send pkg_delete errors to /tmp/pkg-delete_errors.txt --- etc/inc/pkg-utils.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc index f2ee955251..ea8c7d7b61 100644 --- a/etc/inc/pkg-utils.inc +++ b/etc/inc/pkg-utils.inc @@ -98,7 +98,7 @@ conf_mount_ro(); * ******/ function remove_freebsd_package($packagestring) { - exec("/usr/sbin/pkg_delete -x {$packagestring}"); + exec("/usr/sbin/pkg_delete -x {$packagestring} 2>>/tmp/pkg_delete_errors.txt"); } /****f* pkg-utils/is_package_installed @@ -222,6 +222,8 @@ function resync_all_package_configs($show_message = false) { * package is installed. */ function is_freebsd_pkg_installed($pkg) { + if(!$pkg) + return; $output = ""; exec("/usr/sbin/pkg_info -E \"{$pkg}*\"", $output, $retval); @@ -826,6 +828,9 @@ function does_package_depend($pkg) { function delete_package($pkg) { global $config, $g, $static_output, $vardb; + if(!$pkg) + return; + $pkg = substr(reverse_strrchr($pkg, "."), 0, -1); // If package has dependencies then skip it