Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

98_Installer: fix outdated check

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@18875 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2019-03-12 16:52:34 +00:00
parent fa9685dae2
commit 45828f003d
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
fhem/FHEM/98_Installer.pm
View File

@ -1718,15 +1718,21 @@ sub CreateMetadataList ($$$) {
my $check = __IsInstalledPerl($prereq); my $check = __IsInstalledPerl($prereq);
my $installed = ''; my $installed = '';
if ($check) { if ($check) {
if ( $check =~ m/^v/ ) { if ( $check =~ m/^\d+\./ ) {
my $nverReq = my $nverReq =
$version ne '' $version ne ''
? version->parse($version)->numify ? $version
: 0; : 0;
my $nverInst = version->parse($check)->numify; my $nverInst = $check;
#TODO suport for version range:
#https://metacpan.org/pod/CPAN::Meta::Spec#Version-Range
if ( $nverReq > 0 && $nverInst < $nverReq ) { if ( $nverReq > 0 && $nverInst < $nverReq ) {
$installed .= 'OUTDATED (' . $check . ')'; $installed .=
$colorRed
. 'OUTDATED'
. $colorClose . ' ('
. $check . ')';
} }
else { else {
$installed = 'installed'; $installed = 'installed';
@ -1827,8 +1833,8 @@ sub __IsInstalledPerl($) {
return 0 unless ( __PACKAGE__ eq caller(0) ); return 0 unless ( __PACKAGE__ eq caller(0) );
return 0 unless (@_); return 0 unless (@_);
my ($pkg) = @_; my ($pkg) = @_;
return version->parse($])->normal if ( $pkg eq 'perl' ); return version->parse($])->numify if ( $pkg eq 'perl' );
return version->parse( $modules{'Global'}{META}{version} )->normal return $modules{'Global'}{META}{version}
if ( $pkg eq 'FHEM' ); if ( $pkg eq 'FHEM' );
eval "require $pkg;"; eval "require $pkg;";
@ -1839,7 +1845,7 @@ sub __IsInstalledPerl($) {
my $v = eval "$pkg->VERSION()"; my $v = eval "$pkg->VERSION()";
if ($v) { if ($v) {
return version->parse($v)->normal; return $v;
} }
else { else {
return 1; return 1;
@ -1862,6 +1868,9 @@ sub ModuleIsPerlPragma {
sub ModuleIsInternal { sub ModuleIsInternal {
my ($module) = @_; my ($module) = @_;
return 1
if ( $module eq 'fhem.pl' || $module eq 'FHEM' || $module eq 'Global' );
my $p = GetModuleFilepath($module); my $p = GetModuleFilepath($module);
# if module has a relative path, # if module has a relative path,
@ -1882,7 +1891,12 @@ sub GetModuleFilepath {
# From This::That to This/That.pm # From This::That to This/That.pm
s/::/\//g, s/$/.pm/ foreach $module; s/::/\//g, s/$/.pm/ foreach $module;
if ( defined( $INC{$module} ) ) { if ( $module eq 'perl' ) {
push @path, $^X; # real binary
# push @path, $ENV{_}; # symlink if any
}
elsif ( defined( $INC{$module} ) ) {
push @path, $INC{$module}; push @path, $INC{$module};
} }
else { else {
@ -1895,14 +1909,12 @@ sub GetModuleFilepath {
push @path, $INC{$module}; push @path, $INC{$module};
} }
else { else {
push @path, undef; push @path, '';
$@ = undef; $@ = undef;
} }
} }
} }
return unless (@path);
if (wantarray) { if (wantarray) {
return @path; return @path;
} }
@ -2019,7 +2031,7 @@ sub ToDay() {
"perl": 5.014, "perl": 5.014,
"GPUtils": 0, "GPUtils": 0,
"JSON": 0, "JSON": 0,
"FHEM::Meta": 0, "FHEM::Meta": 0.001006,
"Data::Dumper": 0, "Data::Dumper": 0,
"IO::Socket::SSL": 0, "IO::Socket::SSL": 0,
"HttpUtils": 0, "HttpUtils": 0,