summaryrefslogtreecommitdiffstats
path: root/src/usr/local/www/pkg_mgr.php
diff options
context:
space:
mode:
authorStephen Beaver <sbeaver@netgate.com>2015-10-09 10:08:09 -0400
committerStephen Beaver <sbeaver@netgate.com>2015-10-09 10:08:09 -0400
commit3928c6f1bcf911097366f075994dc9a61716e6e3 (patch)
tree67932e7fdc0a959fef41190d6f45d7fec4f5d3fe /src/usr/local/www/pkg_mgr.php
parent0071ef193fbcb87ef135cd4a0aeeba03f8522351 (diff)
downloadpfsense-3928c6f1bcf911097366f075994dc9a61716e6e3.zip
pfsense-3928c6f1bcf911097366f075994dc9a61716e6e3.tar.gz
Further refinement to #5290
Use pkg_remove_prefix()
Diffstat (limited to 'src/usr/local/www/pkg_mgr.php')
-rw-r--r--src/usr/local/www/pkg_mgr.php5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/usr/local/www/pkg_mgr.php b/src/usr/local/www/pkg_mgr.php
index c6b5811..f2d1b57 100644
--- a/src/usr/local/www/pkg_mgr.php
+++ b/src/usr/local/www/pkg_mgr.php
@@ -174,12 +174,9 @@ if(!$pkg_info || !is_array($pkg_info)):?>
continue;
}
- // Get the package basename (because e.g.: sudo is known as pfSense-pkg-sudo)
- $basename = str_replace("pfSense-pkg-", "", $index['name']);
-
// Check to see if it is already installed
foreach($config['installedpackages']['package'] as $installedpkg) {
- if($installedpkg['name'] == $basename) {
+ if($installedpkg['name'] == $shortname) {
continue(2);
}
}
OpenPOWER on IntegriCloud