summaryrefslogtreecommitdiffstats
path: root/etc/inc/pkg-utils.inc
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2006-01-25 03:41:21 +0000
committerScott Ullrich <sullrich@pfsense.org>2006-01-25 03:41:21 +0000
commit9d806dcd94053d05bfb07cf81730a03379ff3c8c (patch)
tree3581f03f2ab826763f7675c4135b3c4f7fb05494 /etc/inc/pkg-utils.inc
parent57abc4f0a935d71fff2bb596a4c80fdc112c0e30 (diff)
downloadpfsense-9d806dcd94053d05bfb07cf81730a03379ff3c8c.zip
pfsense-9d806dcd94053d05bfb07cf81730a03379ff3c8c.tar.gz
Add <include_file> which will require_once() a file without evaling it. This will show us exactly where errors are.
MFC: soon
Diffstat (limited to 'etc/inc/pkg-utils.inc')
-rw-r--r--etc/inc/pkg-utils.inc7
1 files changed, 7 insertions, 0 deletions
diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc
index 9be67ac..2442c5f 100644
--- a/etc/inc/pkg-utils.inc
+++ b/etc/inc/pkg-utils.inc
@@ -463,6 +463,13 @@ function install_package_xml($pkg) {
}
fclose($fd);
+ /* if a require exists, include it. this will
+ * show us where an error exists in a package
+ * instead of making us blindly guess
+ */
+ if($pkg_info['include_file'] <> "")
+ require_once($pkg_info['include_file']);
+
/* pkg_add the package and its dependencies */
if($pkg_info['depends_on_package_base_url'] != "") {
update_status("Installing " . $pkg_info['name'] . " and its dependencies.");
OpenPOWER on IntegriCloud