diff options
| author | Colin Smith <colin@pfsense.org> | 2005-05-24 00:41:33 +0000 |
|---|---|---|
| committer | Colin Smith <colin@pfsense.org> | 2005-05-24 00:41:33 +0000 |
| commit | 2983ae92d6c6ca839078636231ad486173285def (patch) | |
| tree | 29466bb39e83673eb70b4a2e24259e505f5ee190 /usr/local/www/pkg_mgr_install.php | |
| parent | 4cff4d3f9c585e5d923303d1f53c73b0daeb779d (diff) | |
| download | pfsense-2983ae92d6c6ca839078636231ad486173285def.zip pfsense-2983ae92d6c6ca839078636231ad486173285def.tar.gz | |
Tighten up pattern matching - I completely overlooked the obvious :)
Diffstat (limited to 'usr/local/www/pkg_mgr_install.php')
| -rwxr-xr-x | usr/local/www/pkg_mgr_install.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/local/www/pkg_mgr_install.php b/usr/local/www/pkg_mgr_install.php index ecfa4e1..fcc0554 100755 --- a/usr/local/www/pkg_mgr_install.php +++ b/usr/local/www/pkg_mgr_install.php @@ -281,7 +281,7 @@ foreach ($packages_to_install as $id) { $pkg_installed = false; if(isset($pkg_config['packages']['package'][$id]['skip_install_checks'])) $pkg_installed = true; foreach($is_installed as $is_inst) { - if(array_shift(explode('-', $is_inst)) == $pkgent['name']) { + if($is_inst == $pkgent['name'] . $pkgent['version']) { $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(array_shift(explode('-', $is_inst)) == $pkgent['name']) { + if($is_inst == $pkgent['name'] . $pkgent['version']) { $pkg_installed = true; break; } |
