diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2006-01-28 03:39:29 +0000 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2006-01-28 03:39:29 +0000 |
commit | 2df5cb992e33ad43c08760c1363979dd92f2ccb9 (patch) | |
tree | ce8c4211c2776eabfa8223ef983fa8054bbcb792 /etc | |
parent | 0119fc6952e51282c465bd58f0bff8181e09e315 (diff) | |
download | pfsense-2df5cb992e33ad43c08760c1363979dd92f2ccb9.zip pfsense-2df5cb992e33ad43c08760c1363979dd92f2ccb9.tar.gz |
Download additional files first
Diffstat (limited to 'etc')
-rw-r--r-- | etc/inc/pkg-utils.inc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc index ccbddc8..a015403 100644 --- a/etc/inc/pkg-utils.inc +++ b/etc/inc/pkg-utils.inc @@ -502,17 +502,7 @@ function install_package_xml($pkg) { if(file_exists("/usr/local/pkg/" . $configfile)) { $static_output .= "Loading package configuration... "; update_output_window($static_output); - $pkg_config = parse_xml_config_pkg("/usr/local/pkg/" . $configfile, "packagegui"); - /* 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_config['include_file'] <> "") { - $static_output = "Loading package instructions..."; - update_output_window($static_output); - fwrite($fd_log, "require_once('include_file')\n"); - require_once($pkg_config['include_file']); - } + $pkg_config = parse_xml_config_pkg("/usr/local/pkg/" . $configfile, "packagegui"); $static_output .= "done.\n"; update_output_window($static_output); $static_output .= "Configuring package components...\n"; @@ -566,6 +556,16 @@ function install_package_xml($pkg) { $static_output .= "done.\n"; update_output_window($static_output); } + /* 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_config['include_file'] <> "") { + $static_output = "Loading package instructions..."; + update_output_window($static_output); + fwrite($fd_log, "require_once('include_file')\n"); + require_once($pkg_config['include_file']); + } /* sidebar items */ if($pkg_config['menu'] != "") { $static_output .= "\tMenu items... "; |