From 57e8e410897a48d8a5b47960cf0474d8536e7823 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Thu, 3 Feb 2022 17:49:29 +0100 Subject: [PATCH 1/2] Manager: Parse version suffixes with decimals correctly --- library/Icinga/Application/Modules/Manager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/Icinga/Application/Modules/Manager.php b/library/Icinga/Application/Modules/Manager.php index 254fd3c3e..0b838f385 100644 --- a/library/Icinga/Application/Modules/Manager.php +++ b/library/Icinga/Application/Modules/Manager.php @@ -465,7 +465,7 @@ class Manager } $operator = '='; - if (preg_match('/^([<>=]{1,2})\s*v?((?:[\d.]+)(?:\D+)?)$/', $version, $match)) { + if (preg_match('/^([<>=]{1,2})\s*v?((?:[\d.]+)(?:.+)?)$/', $version, $match)) { $operator = $match[1]; $version = $match[2]; } From d78bb02b41baed310de3ea82070d5b11ebb21ceb Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Thu, 3 Feb 2022 17:49:56 +0100 Subject: [PATCH 2/2] Module: Parse requirements in metadata correctly --- library/Icinga/Application/Modules/Module.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php index 0a7e5799f..a4af34220 100644 --- a/library/Icinga/Application/Modules/Module.php +++ b/library/Icinga/Application/Modules/Module.php @@ -829,8 +829,7 @@ class Module if (preg_match('/^([\w\-\/]+)\s+\((.+)\)$/', $part, $m)) { $metadata->{$key}[$m[1]] = $m[2]; } else { - // TODO: FAIL? - continue; + $metadata->{$key}[$part] = true; } }