From b1702d0c0a12758df069e294dfd72cf9300191d8 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 12 Nov 2019 08:59:52 +0100 Subject: [PATCH] firmware: duplicates stay in the config #1663 When we install "os-debug" it will deinstall "os-debug-devel" so we should update our logic. --- .../controllers/OPNsense/Core/Api/FirmwareController.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php b/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php index 3f0a71336..20f967867 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php @@ -90,6 +90,14 @@ class FirmwareController extends ApiControllerBase switch ($action) { case 'install': case 'reinstall': + /* find the development/stable equivalent */ + $other = preg_replace('/-devel$/', '', $name); + if ($other == $name) { + $other = "$name-devel"; + } + if (isset($plugins[$other])) { + unset($plugins[$other]); + } $plugins[$name] = 'hello'; break; case 'remove':