FHEM/mod-Installer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

patch from Sidey, see https://forum.fhem.de/index.php?topic=137375.0 and https://forum.fhem.de/index.php?topic=137391.0

Browse Source
This commit is contained in:
Marko Oldenburg 2024-03-08 06:44:21 +01:00
parent 3048f536f3
commit 45185685aa
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
FHEM/98_Installer.pm
View File

@ -42,6 +42,8 @@ use Data::Dumper;
use Config; use Config;
use ExtUtils::Installed; use ExtUtils::Installed;
# Run before module compilation # Run before module compilation
BEGIN { BEGIN {
@ -82,6 +84,10 @@ BEGIN {
); );
} }
use constant HAS_METARequirementsRange => defined eval {
require CPAN::Meta::Requirements::Range;
};
# try to use JSON::MaybeXS wrapper # try to use JSON::MaybeXS wrapper
# for chance of better performance + open code # for chance of better performance + open code
eval { eval {
@ -5136,14 +5142,15 @@ sub LoadInstallStatusPerl(;$) {
&& $instV ne '' && $instV ne ''
&& $instV ne '0' ) && $instV ne '0' )
{ {
$reqV = version->parse($reqV)->numify; if ( !HAS_METARequirementsRange )
$instV = version->parse($instV)->numify; {
$pkgStatus{Perl}{pkgs}{$pkg}{status} = 'unknown';
#TODO suport for version range: next;
# https://metacpan.org/pod/ \ }
# CPAN::Meta::Spec#Version-Range my $vRange = CPAN::Meta::Requirements::Range->with_string_requirement($reqV);
if ( $reqV > 0 && $instV < $reqV ) {
if (!defined $vRange->accepts($instV) )
{
$pkgStatus{Perl}{pkgs}{$pkg}{status} = $pkgStatus{Perl}{pkgs}{$pkg}{status} =
'outdated'; 'outdated';
push push
@ -5155,6 +5162,7 @@ sub LoadInstallStatusPerl(;$) {
'META.json' 'META.json'
&& !$pkgStatus{Perl}{analyzed} ); && !$pkgStatus{Perl}{analyzed} );
} }
} }
} }
@ -5541,13 +5549,13 @@ sub __list_module {
"abstract": "Modul zum Update von FHEM, zur Installation von Drittanbieter FHEM Modulen und der Verwaltung von Systemvoraussetzungen" "abstract": "Modul zum Update von FHEM, zur Installation von Drittanbieter FHEM Modulen und der Verwaltung von Systemvoraussetzungen"
} }
}, },
"version": "v0.5.7", "version": "v0.6.0",
"release_status": "stable", "release_status": "stable",
"author": [ "author": [
"Julian Pawlowski <julian.pawlowski@gmail.com>" "Julian Pawlowski <julian.pawlowski@gmail.com>"
], ],
"x_fhem_maintainer": [ "x_fhem_maintainer": [
"loredo" "coolTux"
], ],
"x_fhem_maintainer_github": [ "x_fhem_maintainer_github": [
"jpawlowski" "jpawlowski"
@ -5560,6 +5568,7 @@ sub __list_module {
"prereqs": { "prereqs": {
"runtime": { "runtime": {
"requires": { "requires": {
"CPAN::Meta::Requirements::Range": "2.143",
"Data::Dumper": 0, "Data::Dumper": 0,
"Encode": 0, "Encode": 0,
"FHEM": 5.00918623, "FHEM": 5.00918623,