lucaspalomodevelop/opnsense-core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/opnsense-core.git synced 2026-03-13 00:07:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

firmware: use full plugin names now and make sure to zap whitespace; closes #7818

Browse Source
This commit is contained in:
Franco Fichtner 2024-08-27 12:10:41 +02:00
parent d1c7ed00ab
commit 8b7510a3a6
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -199,6 +199,9 @@ CORE_DEPENDS?= ca_root_nss \
CORE_CONFLICTS+= ${CONFLICT}-devel
.endfor
# assume conflicts are just for plugins
CORE_CONFLICTS:= ${CORE_CONFLICTS:S/^/os-/g:O}
WRKDIR?=${.CURDIR}/work
WRKSRC?=${WRKDIR}/src
PKGDIR?=${WRKDIR}/pkg

2
src/opnsense/scripts/firmware/register.php
View File

@ -112,7 +112,7 @@ function plugins_disk_get()
}
if (!empty($ret['product_conflicts'])) {
foreach (explode(' ', $ret['product_conflicts']) as $conflict) {
foreach (preg_split('/\s+/', $ret['product_conflicts']) as $conflict) {
$obsolete[$conflict] = "I'm not even here";
}
}