Revision 5a5cbf01
Added by Jim Pingle over 9 years ago
| src/etc/inc/pkg-utils.inc | ||
|---|---|---|
| 702 | 702 |
return false; |
| 703 | 703 |
} |
| 704 | 704 |
|
| 705 |
$configfile = substr(strrchr($pkg_info['config_file'], '/'), 1); |
|
| 706 |
if (file_exists("/usr/local/pkg/" . $configfile)) {
|
|
| 705 |
if (file_exists("/usr/local/pkg/" . $pkg_info['configurationfile'])) {
|
|
| 707 | 706 |
update_status(gettext("Loading package configuration... "));
|
| 708 |
$pkg_config = parse_xml_config_pkg("/usr/local/pkg/" . $configfile, "packagegui");
|
|
| 707 |
$pkg_config = parse_xml_config_pkg("/usr/local/pkg/" . $pkg_info['configurationfile'], "packagegui");
|
|
| 709 | 708 |
update_status(gettext("done.") . "\n");
|
| 710 | 709 |
update_status(gettext("Configuring package components...") . "\n");
|
| 711 | 710 |
if (!empty($pkg_config['filter_rules_needed'])) {
|
Also available in: Unified diff
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.