diff options
| author | Colin Smith <colin@pfsense.org> | 2005-06-12 19:20:27 +0000 |
|---|---|---|
| committer | Colin Smith <colin@pfsense.org> | 2005-06-12 19:20:27 +0000 |
| commit | 859d97331be0436c58c480b3338a8d14193c56b1 (patch) | |
| tree | e091b89c6fb002a5b61153adedbbd46d1ff71949 /etc | |
| parent | 230ede67a05a4cde93bee3eca76adce5181212e1 (diff) | |
| download | pfsense-859d97331be0436c58c480b3338a8d14193c56b1.zip pfsense-859d97331be0436c58c480b3338a8d14193c56b1.tar.gz | |
Fix various nagging package issues.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/pkg-utils.inc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc index adea3ae..caeda96 100644 --- a/etc/inc/pkg-utils.inc +++ b/etc/inc/pkg-utils.inc @@ -402,16 +402,17 @@ function install_package($package, $pkg_info = "") { $static_orig = $static_output; $static_output .= "\n"; update_output_window($static_output); + $pkg_name = substr(reverse_strrchr($pkg_info['depends_on_package'], "."), 0, -1); if(isset($pkg_info['skip_install_checks'])) { $pkg_installed = true; } else { - $pkg_installed = is_freebsd_pkg_installed($pkg_info['name'] . "-" . $pkg_info['version']); + $pkg_installed = is_freebsd_pkg_installed($pkg_name); } - if($pkg_installed == false) pkg_fetch_recursive($pkg_info['name'] . "-" . $pkg_info['version'], $pkg_info['depends_on_package'], 0, $pkg_info['depends_on_package_base_url']); + if($pkg_installed == false) pkg_fetch_recursive($pkg_name, $pkg_info['depends_on_package'], 0, $pkg_info['depends_on_package_base_url']); $static_output = $static_orig . "done.\nChecking for successful package installation... "; update_output_window($static_output); /* make sure our package was successfully installed */ - if($pkg_installed == false) $pkg_installed = is_freebsd_pkg_installed($pkg_info['name'] . "-" . $pkg_info['version']); + if($pkg_installed == false) $pkg_installed = is_freebsd_pkg_installed($pkg_name); if($pkg_installed == true) { $static_output .= "done.\n"; update_output_window($static_output); |
