diff options
| author | jim-p <jimp@pfsense.org> | 2015-12-07 08:42:15 -0500 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2015-12-07 08:43:13 -0500 |
| commit | 5a5cbf013b3d2a312c5dccb19a6a171aba35b1b5 (patch) | |
| tree | b11aa67813b7b53db65d8fa8366f80b12c8a1602 /src/etc/inc/pkg-utils.inc | |
| parent | 314e439e42cb6fa763e16fdbf4a505301c0dc378 (diff) | |
| download | pfsense-5a5cbf013b3d2a312c5dccb19a6a171aba35b1b5.zip pfsense-5a5cbf013b3d2a312c5dccb19a6a171aba35b1b5.tar.gz | |
Eliminate an incorrect use of config_file from a pkg info.xml (it should be reading configurationfile, not config_file)
This is the last place that references the old config_file field, it will be safe to remove once this is in snapshots.
Diffstat (limited to 'src/etc/inc/pkg-utils.inc')
| -rw-r--r-- | src/etc/inc/pkg-utils.inc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/etc/inc/pkg-utils.inc b/src/etc/inc/pkg-utils.inc index d76afbc..81f5b02 100644 --- a/src/etc/inc/pkg-utils.inc +++ b/src/etc/inc/pkg-utils.inc @@ -702,10 +702,9 @@ function install_package_xml($package_name) { return false; } - $configfile = substr(strrchr($pkg_info['config_file'], '/'), 1); - if (file_exists("/usr/local/pkg/" . $configfile)) { + if (file_exists("/usr/local/pkg/" . $pkg_info['configurationfile'])) { update_status(gettext("Loading package configuration... ")); - $pkg_config = parse_xml_config_pkg("/usr/local/pkg/" . $configfile, "packagegui"); + $pkg_config = parse_xml_config_pkg("/usr/local/pkg/" . $pkg_info['configurationfile'], "packagegui"); update_status(gettext("done.") . "\n"); update_status(gettext("Configuring package components...") . "\n"); if (!empty($pkg_config['filter_rules_needed'])) { |
