diff options
author | Colin Smith <colin@pfsense.org> | 2005-05-24 00:24:21 +0000 |
---|---|---|
committer | Colin Smith <colin@pfsense.org> | 2005-05-24 00:24:21 +0000 |
commit | 4cff4d3f9c585e5d923303d1f53c73b0daeb779d (patch) | |
tree | ec900fb7e053ffe3dde707318f190a5d08c0645b /usr | |
parent | 0d534dcece353eda27bb473a451c5d78f2a7d9d2 (diff) | |
download | pfsense-4cff4d3f9c585e5d923303d1f53c73b0daeb779d.zip pfsense-4cff4d3f9c585e5d923303d1f53c73b0daeb779d.tar.gz |
* Fix skip_install_checks.
* Loosen up pattern matching on /var/db/pkg. This is not an ideal solution.
Diffstat (limited to 'usr')
-rwxr-xr-x | usr/local/www/pkg_mgr_install.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/local/www/pkg_mgr_install.php b/usr/local/www/pkg_mgr_install.php index 6c13351..ecfa4e1 100755 --- a/usr/local/www/pkg_mgr_install.php +++ b/usr/local/www/pkg_mgr_install.php @@ -279,9 +279,9 @@ foreach ($packages_to_install as $id) { update_output_window($static_output); exec("ls /var/db/pkg", $is_installed); $pkg_installed = false; - if(isset($pkgent['skip_install_checks'])) $pkg_installed = true; + if(isset($pkg_config['packages']['package'][$id]['skip_install_checks'])) $pkg_installed = true; foreach($is_installed as $is_inst) { - if($is_inst == $pkgent['name'] . '-' . $pkgent['version']) { + if(array_shift(explode('-', $is_inst)) == $pkgent['name']) { $pkg_installed = true; break; } @@ -297,7 +297,7 @@ foreach ($packages_to_install as $id) { if($pkg_installed == false) { exec("ls /var/db/pkg", $is_installed); foreach($is_installed as $is_inst) { - if($is_inst == $pkgent['name'] . '-' . $pkgent['version']) { + if(array_shift(explode('-', $is_inst)) == $pkgent['name']) { $pkg_installed = true; break; } |